diff --git a/mediagoblin/plugins/basic_auth/__init__.py b/mediagoblin/plugins/basic_auth/__init__.py
index 74d6b836..d0545627 100644
--- a/mediagoblin/plugins/basic_auth/__init__.py
+++ b/mediagoblin/plugins/basic_auth/__init__.py
@@ -28,9 +28,10 @@ def setup_plugin():
 
 
 def check_login(user, password):
-    result = auth_lib.bcrypt_check_password(password, user.pw_hash)
-    if result:
-        return result
+    if user.pw_hash:
+        result = auth_lib.bcrypt_check_password(password, user.pw_hash)
+        if result:
+            return result
     return None