diff --git a/lib/krb5/get_addrs.c b/lib/krb5/get_addrs.c
index 11937c677..2761b50ec 100644
--- a/lib/krb5/get_addrs.c
+++ b/lib/krb5/get_addrs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -229,8 +229,11 @@ get_addrs_int (krb5_context context, krb5_addresses *res, int flags)
 	ret = find_all_addresses (context, res, flags);
 	if(ret || res->len == 0)
 	    ret = gethostname_fallback (context, res);
-    } else
+    } else {
+	res->len = 0;
+	res->val = NULL;
 	ret = 0;
+    }
 
     if(ret == 0 && (flags & EXTRA_ADDRESSES)) {
 	krb5_addresses a;