diff --git a/nest/password.c b/nest/password.c
index 30c09bf6..c2706270 100644
--- a/nest/password.c
+++ b/nest/password.c
@@ -56,6 +56,8 @@ password_same(struct password_item *old, struct password_item *new)
 {
   if (old == new)
     return 1;
+  if ((!old) || (!new))
+    return 0;
   return ((old->from == new->from) &&
 	  (old->to == new->to) &&
 	  (old->passive == new->passive) &&