diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index cd4309c4655..f24d0a79cc5 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -1260,7 +1260,8 @@ do_connect(char *dbname, char *user, char *host, char *port)
 	 * syntax.
 	 */
 	keep_password =
-		((strcmp(user, PQuser(o_conn)) == 0) &&
+		(o_conn &&
+		 (strcmp(user, PQuser(o_conn)) == 0) &&
 		 (!host || strcmp(host, PQhost(o_conn)) == 0) &&
 		 (strcmp(port, PQport(o_conn)) == 0) &&
 		 !has_connection_string);