diff --git a/webui/index.html b/webui/index.html
index 68eedd71..8517ce0f 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -9,8 +9,8 @@
 <script type="text/javascript">
 function updateRouterInfo(result, session) {
     if(session.error) {
-        alert("Error: " + result["error"]);
-        return; // TODO: try to recover
+        alert("Error: " + session.error["message"]);
+        return;
     }
     I2PControl.updateDocument({
         "version" : result["i2p.router.version"],
diff --git a/webui/javascript/I2PControl.js b/webui/javascript/I2PControl.js
index 120a23a5..43db6eaf 100644
--- a/webui/javascript/I2PControl.js
+++ b/webui/javascript/I2PControl.js
@@ -16,11 +16,19 @@ I2PControl.Session.prototype = {
         var self = this;
         request.onreadystatechange = function() {
             if(this.readyState == 4 && this.status == "200" && this.responseText != "") {
-                var result = JSON.parse(this.responseText).result;
-                if(result.hasOwnProperty("error")) {
-                    self.error = true;
+                var data = JSON.parse(this.responseText);
+                if(data.hasOwnProperty("error")) {
+                    if(data["error"]["code"] == -32003 || data["error"]["code"] == -32004) {
+                        // Get a new token and resend the request
+                        self.start(function() {
+                            self.request(method, params, handler);
+                        }); 
+                        return;
+                    }
+                    // Cannot fix the error, report it
+                    self.error = data["error"];
                 }
-                handler(result, self);
+                handler(data.result, self);
             }
         };
         if(this.token != "")