===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/compat.c,v
retrieving revision 1.120.4.1
retrieving revision 1.121
diff -u -r1.120.4.1 -r1.121
--- src/usr.bin/ssh/compat.c	2023/02/02 12:13:20	1.120.4.1
+++ src/usr.bin/ssh/compat.c	2023/02/02 12:10:05	1.121
@@ -1,4 +1,4 @@
-/* $OpenBSD: compat.c,v 1.120.4.1 2023/02/02 12:13:20 bluhm Exp $ */
+/* $OpenBSD: compat.c,v 1.121 2023/02/02 12:10:05 djm Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
@@ -205,9 +205,9 @@
 		free(cp);
 		cp = cp2;
 	}
-	debug2_f("compat KEX proposal: %s", cp);
-	if (*cp == '\0')
+	if (cp == NULL || *cp == '\0')
 		fatal("No supported key exchange algorithms found");
+	debug2_f("compat KEX proposal: %s", cp);
 	return cp;
 }