diff --git a/wmbiff/wmbiff/passwordMgr.c b/wmbiff/wmbiff/passwordMgr.c
index 3faabc3..917291b 100644
--- a/wmbiff/wmbiff/passwordMgr.c
+++ b/wmbiff/wmbiff/passwordMgr.c
@@ -235,9 +235,11 @@ char *passwordFor(const char *username, const char *servername, Pop3 *pc,
 				return (ret);
 			}
 			/* else fall through, overwrite */
-		} else if (pc) {
-			/* if we've asked, but received nothing, disable this box */
-			pc->checkMail = NULL;
+		} else {
+			if (pc) {
+				/* if we've asked, but received nothing, disable this box */
+				pc->checkMail = NULL;
+			}
 			return (NULL);
 		}
 	} else {