diff --git a/lib/commands.py b/lib/commands.py
index 442228ee..642ccae0 100644
--- a/lib/commands.py
+++ b/lib/commands.py
@@ -100,6 +100,9 @@ class Commands:
             password = password_getter()
             if password is None:
                 return
+        else:
+            password = None
+
         f = getattr(self, method)
         if cmd.requires_password:
             result = f(*args, **{'password':password})