diff --git a/lib/krb5/rd_priv.c b/lib/krb5/rd_priv.c
index 673bd03ba..90539958f 100644
--- a/lib/krb5/rd_priv.c
+++ b/lib/krb5/rd_priv.c
@@ -103,6 +103,7 @@ krb5_rd_priv(krb5_context context,
   /* check receiver address */
 
   if (part.r_address
+      && auth_context->local_address
       && !krb5_address_compare (context,
 				auth_context->local_address,
 				part.r_address)) {
diff --git a/lib/krb5/rd_safe.c b/lib/krb5/rd_safe.c
index 8debb0e57..e7f6d5ccb 100644
--- a/lib/krb5/rd_safe.c
+++ b/lib/krb5/rd_safe.c
@@ -82,6 +82,7 @@ krb5_rd_safe(krb5_context context,
   /* check receiver address */
 
   if (safe.safe_body.r_address
+      && auth_context->local_address
       && !krb5_address_compare (context,
 				auth_context->local_address,
 				safe.safe_body.r_address)) {