diff --git a/lib/krb5/rd_priv.c b/lib/krb5/rd_priv.c
index e90abe219..59a3e8afa 100644
--- a/lib/krb5/rd_priv.c
+++ b/lib/krb5/rd_priv.c
@@ -43,6 +43,7 @@ krb5_rd_priv(krb5_context context,
   /* check sender address */
 
   if (part.s_address
+      && auth_context->remote_address
       && !krb5_address_compare (context,
 				auth_context->remote_address,
 				part.s_address)) {
diff --git a/lib/krb5/rd_safe.c b/lib/krb5/rd_safe.c
index a14723056..2e70d2a96 100644
--- a/lib/krb5/rd_safe.c
+++ b/lib/krb5/rd_safe.c
@@ -33,6 +33,7 @@ krb5_rd_safe(krb5_context context,
   /* check sender address */
 
   if (safe.safe_body.s_address
+      && auth_context->remote_address
       && !krb5_address_compare (context,
 				auth_context->remote_address,
 				safe.safe_body.s_address)) {