diff --git a/ChangeLog b/ChangeLog
index 87489355c..7a0ec2158 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,11 @@
    [configure.ac defines.h] modify previous SCO3 fix to not break Solaris 7
    [acconfig.h] remove unused HAVE_REGCOMP
  - (stevesk) openbsd-compat/base64.h: typo in comment
+ - (bal) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2002/02/15 23:54:10
+     [auth-krb5.c]
+     krb5_get_err_text() does not like context==NULL; he@nordu.net via google; 
+     ok provos@
 
 20020225
  - (bal) Last AIX patch.  Moved aix_usrinfo() outside of do_setuserconext()
@@ -7687,4 +7692,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1876 2002/02/26 16:59:58 stevesk Exp $
+$Id: ChangeLog,v 1.1877 2002/02/26 17:46:11 mouring Exp $
diff --git a/auth-krb5.c b/auth-krb5.c
index bf2412080..aaf146e76 100644
--- a/auth-krb5.c
+++ b/auth-krb5.c
@@ -2,7 +2,7 @@
  *    Kerberos v5 authentication and ticket-passing routines.
  * 
  * $FreeBSD: src/crypto/openssh/auth-krb5.c,v 1.6 2001/02/13 16:58:04 assar Exp $
- * $OpenBSD: auth-krb5.c,v 1.4 2002/01/27 15:12:09 markus Exp $
+ * $OpenBSD: auth-krb5.c,v 1.5 2002/02/15 23:54:10 markus Exp $
  */
 
 #include "includes.h"
@@ -118,9 +118,14 @@ auth_krb5(Authctxt *authctxt, krb5_data *auth, char **client)
 	if (reply.length)
 		xfree(reply.data);
 
-	if (problem)
-		debug("Kerberos v5 authentication failed: %s",
-		    krb5_get_err_text(authctxt->krb5_ctx, problem));
+	if (problem) {
+		if (authctxt->krb5_ctx != NULL)
+			debug("Kerberos v5 authentication failed: %s",
+			    krb5_get_err_text(authctxt->krb5_ctx, problem));
+		else
+			debug("Kerberos v5 authentication failed: %d",
+			    problem);
+	}
 
 	return (ret);
 }
@@ -222,8 +227,12 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
 	restore_uid();
 
 	if (problem) {
-		debug("Kerberos password authentication failed: %s",
-		    krb5_get_err_text(authctxt->krb5_ctx, problem));
+		if (authctxt->krb5_ctx != NULL)
+			debug("Kerberos password authentication failed: %s",
+			    krb5_get_err_text(authctxt->krb5_ctx, problem));
+		else
+			debug("Kerberos password authentication failed: %d",
+			    problem);
 
 		krb5_cleanup_proc(authctxt);