diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c
index 6097b13dfc..c2a93b3bef 100644
--- a/libnm-util/crypto.c
+++ b/libnm-util/crypto.c
@@ -406,6 +406,9 @@ make_des_key (const char *cipher,
 		return NULL;
 	}
 
+	if (password[0] == '\0')
+		return NULL;
+
 	key = g_malloc0 (digest_len + 1);
 
 	if (!crypto_md5_hash (salt,