diff --git a/assets/web/troubleshooting.html b/assets/web/troubleshooting.html
index e1bed390..70c90c99 100644
--- a/assets/web/troubleshooting.html
+++ b/assets/web/troubleshooting.html
@@ -2,7 +2,7 @@
   <h1 class="my-4">Troubleshooting</h1>
   <!--Force Close App-->
   <div class="card p-2 my-4">
-    <div>
+    <div class="card-body">
       <h2>Force Close</h2>
       <br />
       <p>
@@ -15,20 +15,20 @@
       <div class="alert alert-danger" v-if="closeAppStatus === false">
         Error while closing Appplication
       </div>
-    </div>
-    <div>
-      <button
-        class="btn btn-warning"
-        :disabled="closeAppPressed"
-        @click="closeApp"
-      >
-        Force Close
-      </button>
+      <div>
+        <button
+          class="btn btn-warning"
+          :disabled="closeAppPressed"
+          @click="closeApp"
+        >
+          Force Close
+        </button>
+      </div>
     </div>
   </div>
   <!--Unpair all Clients-->
   <div class="card p-2 my-4">
-    <div>
+    <div class="card-body">
       <h2>Unpair All Clients</h2>
       <br />
       <p>Remove all your paired devices</p>
@@ -38,15 +38,15 @@
       <div class="alert alert-danger" v-if="unpairAllStatus === false">
         Error while unpairing
       </div>
-    </div>
-    <div>
-      <button
-        class="btn btn-danger"
-        :disabled="unpairAllPressed"
-        @click="unpairAll"
-      >
-        Unpair All
-      </button>
+      <div>
+        <button
+          class="btn btn-danger"
+          :disabled="unpairAllPressed"
+          @click="unpairAll"
+        >
+          Unpair All
+        </button>
+      </div>
     </div>
   </div>
 </div>
diff --git a/sunshine/confighttp.cpp b/sunshine/confighttp.cpp
index 5c5b1120..c4440b95 100644
--- a/sunshine/confighttp.cpp
+++ b/sunshine/confighttp.cpp
@@ -524,17 +524,8 @@ void unpairAll(resp_https_t response, req_https_t request){
     pt::write_json(data, outputTree);
     response->write(data.str());
   });
-
-  try {
-    nvhttp::erase_all_clients();
-    outputTree.put("status", true);
-  }
-  catch(std::exception &e) {
-    BOOST_LOG(warning) << "unpairAll: "sv << e.what();
-    outputTree.put("status", false);
-    outputTree.put("error", e.what());
-    return;
-  }
+  nvhttp::erase_all_clients();
+  outputTree.put("status", true);
 }
 
 void closeApp(resp_https_t response, req_https_t request){
@@ -550,16 +541,8 @@ void closeApp(resp_https_t response, req_https_t request){
     response->write(data.str());
   });
 
-  try {
-    proc::proc.terminate();
-    outputTree.put("status", true);
-  }
-  catch(std::exception &e) {
-    BOOST_LOG(warning) << "CloseApp: "sv << e.what();
-    outputTree.put("status", false);
-    outputTree.put("error", e.what());
-    return;
-  }
+  proc::proc.terminate();
+  outputTree.put("status", true);
 }
 
 void start() {