diff --git a/vfs/util-alone.c b/vfs/util-alone.c
index 9abff080c..ce15d2434 100644
--- a/vfs/util-alone.c
+++ b/vfs/util-alone.c
@@ -146,6 +146,9 @@ void
 wipe_password (char *passwd)
 {
     char *p = passwd;
+
+    if (p == NULL)
+	    return;
     
     for (;*p; p++)
         *p = 0;