diff --git a/connect.c b/connect.c
index 02e738a014..d3e967fcd9 100644
--- a/connect.c
+++ b/connect.c
@@ -628,8 +628,12 @@ char *git_getpass(const char *prompt)
 
 	askpass = getenv("GIT_ASKPASS");
 
-	if (!askpass || !(*askpass))
-		return getpass(prompt);
+	if (!askpass || !(*askpass)) {
+		char *result = getpass(prompt);
+		if (!result)
+			die_errno("Could not read password");
+		return result;
+	}
 
 	args[0] = askpass;
 	args[1]	= prompt;