diff --git a/app/cli.js b/app/cli.js
index 0f31b5fbc833790fe6c8527d2ad32960ce209286..623fdc34c0c166af02aa4239abb60c0d1ba84502 100644
--- a/app/cli.js
+++ b/app/cli.js
@@ -441,7 +441,7 @@ program
         }
         yield server.disconnect();
         return jsoned;
-      } catch(e) {
+      } catch(err) {
           logger.warn(err.message || err);
           server.disconnect()
             .catch(() => null)
@@ -691,7 +691,7 @@ function connect(callback, useDefaultConf) {
           return callback.apply(this, cbArgs);
         } catch(e) {
           server.disconnect();
-          throw Error(err);
+          throw e;
 	}
       });
   };
@@ -883,9 +883,9 @@ function configure(server, conf) {
           logger.debug("Configuration saved.");
           return conf;
         } catch (e) {
-          logger.error("Configuration could not be saved: " + err);
-          throw Error(err);
-	}
+          logger.error("Configuration could not be saved: " + e);
+          throw Error(e);
+        }
       });
   });
 }