diff --git a/resources/report/js/script.js b/resources/report/js/script.js
index dcc290e6..f6fdc158 100644
--- a/resources/report/js/script.js
+++ b/resources/report/js/script.js
@@ -992,7 +992,7 @@ function startSearch(evt) {
         var request = JSON.stringify({
             name: 'find',
             args: [
-                evt.target.inputValue,
+                evt.target.value,
                 findNext
             ]
         });
diff --git a/resources/report/report.html b/resources/report/report.html
index 1dc332df..285133b3 100644
--- a/resources/report/report.html
+++ b/resources/report/report.html
@@ -30,6 +30,7 @@
     <link rel="import" href="bower_components/paper-icon-button/paper-icon-button.html">
     <link rel="import" href="bower_components/paper-button/paper-button.html">
     <link rel="import" href="bower_components/paper-input/paper-input.html">
+    <link rel="import" href="bower_components/paper-input/paper-input-decorator.html">
     <link rel="import" href="bower_components/paper-tabs/paper-tabs.html">
     <link rel="import" href="bower_components/paper-checkbox/paper-checkbox.html">
     <link rel="import" href="bower_components/paper-dialog/paper-dialog.html">
@@ -135,7 +136,9 @@
                 </core-menu>
             </core-animated-pages>
             <core-tooltip label="Press Enter when searching to select the next match." position="top">
-                <paper-input id="searchBox" type="search" label="Search content..."></paper-input>
+                <paper-input-decorator label="Your Name">
+                    <input id="searchBox" is="core-input" type="search">
+                </paper-input-decorator>
             </core-tooltip>
         </div>
         <div main id="main">
diff --git a/src/gui/handler.cpp b/src/gui/handler.cpp
index b49c22dd..7bf9e033 100644
--- a/src/gui/handler.cpp
+++ b/src/gui/handler.cpp
@@ -198,8 +198,14 @@ namespace loot {
 
         if (requestName == "find") {
             // Has one arg, which is the search string.
-            Find(browser, request["args"][0].as<string>(), request["args"][1].as<bool>());
-            callback->Success("");
+            try {
+                Find(browser, request["args"][0].as<string>(), request["args"][1].as<bool>());
+                callback->Success("");
+            }
+            catch (std::exception& e) {
+                BOOST_LOG_TRIVIAL(error) << "Failed to perform search. Details: " << e.what();
+                callback->Failure(-1, string("Failed to perform search. Details: ") + e.what());
+            }
             return true;
         }
         else if (requestName == "changeGame") {