Merge branch 'master' of github.com:open-cloud/xos
diff --git a/external/keystone_user.py b/external/keystone_user.py
index 0139ad4..9290847 100644
--- a/external/keystone_user.py
+++ b/external/keystone_user.py
@@ -220,6 +220,7 @@
         user = get_user(keystone, user_name)
     except KeyError:
         # Tenant doesn't exist yet
+        user = None
         pass
     else:
         # User does exist, check if it's current