diff --git a/src/common/passwords.py b/src/common/passwords.py
index 577913e81..3c7b7237c 100644
--- a/src/common/passwords.py
+++ b/src/common/passwords.py
@@ -40,6 +40,8 @@ class GnomePasswordStorage(object):
 
 	def get_password(self, account_name):
 		conf = gajim.config.get_per('accounts', account_name, 'password')
+		if conf is None:
+			return None
 		try:
 			unused, auth_token = conf.split('gnomekeyring:')
 			auth_token = int(auth_token)