diff --git a/resources/report/html/editable-table.html b/resources/report/html/editable-table.html
index a7e3cace..479048d3 100644
--- a/resources/report/html/editable-table.html
+++ b/resources/report/html/editable-table.html
@@ -57,18 +57,18 @@
 </template>
 <template id="gameRow">
     <tr>
-        <td><paper-input class="name" type="text" required></paper-input></td>
+        <td><input class="name" type="text" required></td>
         <td>
             <select class="type">
             <!-- Game <option> elements go here. -->
             </select>
         </td>
-        <td><paper-input class="folder" type="text" required></paper-input></td>
-        <td><paper-input class="master" type="text"></paper-input></td>
-        <td><paper-input class="repo" type="text"></paper-input></td>
-        <td><paper-input class="branch" type="text"></paper-input></td>
-        <td><paper-input class="path" type="text"></paper-input></td>
-        <td><paper-input class="registry" type="text"></paper-input></td>
+        <td><input class="folder" type="text" required></td>
+        <td><input class="master" type="text"></td>
+        <td><input class="repo" type="text"></td>
+        <td><input class="branch" type="text"></td>
+        <td><input class="path" type="text"></td>
+        <td><input class="registry" type="text"></td>
         <td class="fa fa-trash-o fa-fw"></td>
     </tr>
 </template>
diff --git a/resources/report/js/script.js b/resources/report/js/script.js
index ba743db1..b4f13a11 100644
--- a/resources/report/js/script.js
+++ b/resources/report/js/script.js
@@ -1032,7 +1032,7 @@ function closeSettingsDialog(evt) {
         return;
     }
 
-    var dialog = evt.target.parentElement.parentElement;
+    var dialog = evt.target.parentElement;
     if (evt.target.classList.contains('accept')) {
         /* Update the JS variable values. */
         var settings = {
diff --git a/src/gui/handler.cpp b/src/gui/handler.cpp
index b5ef9929..94a36026 100644
--- a/src/gui/handler.cpp
+++ b/src/gui/handler.cpp
@@ -263,18 +263,25 @@ namespace loot {
             g_app_state.UpdateSettings(request["args"][0]);
             // If the user has deleted a default game, we don't want to restore it now.
             // It will be restored when LOOT is next loaded.
-            vector<Game> games(request["args"][0]["games"].as< vector<Game> >());
+            try {
+                BOOST_LOG_TRIVIAL(trace) << "Updating games object.";
+                vector<Game> games(request["args"][0]["games"].as< vector<Game> >());
+                g_app_state.UpdateGames(games);
 
-            g_app_state.UpdateGames(games);
+                // Also enable/disable debug logging as required.
+                if (request["args"][0]["enableDebugLogging"] && request["args"][0]["enableDebugLogging"].as<bool>())
+                    boost::log::core::get()->set_logging_enabled(true);
+                else
+                    boost::log::core::get()->set_logging_enabled(false);
 
-            // Also enable/disable debug logging as required.
-            if (request["args"][0]["enableDebugLogging"].as<bool>())
-                boost::log::core::get()->set_logging_enabled(true);
-            else
-                boost::log::core::get()->set_logging_enabled(false);
-
-            // Now send back the new list of installed games to the UI.
-            callback->Success(GetInstalledGames());
+                // Now send back the new list of installed games to the UI.
+                BOOST_LOG_TRIVIAL(trace) << "Getting new list of installed games.";
+                callback->Success(GetInstalledGames());
+            }
+            catch (exception &e) {
+                BOOST_LOG_TRIVIAL(error) << e.what();
+                callback->Failure(-1, e.what());
+            }
             return true;
         }
         else if (requestName == "applySort") {