diff --git a/encfs/readpassphrase.cpp b/encfs/readpassphrase.cpp
index 93750f7..7e1a334 100644
--- a/encfs/readpassphrase.cpp
+++ b/encfs/readpassphrase.cpp
@@ -143,8 +143,8 @@ restart:
         *p++ = ch;
       }
     }
+    *p = '\0';
   }
-  *p = '\0';
   save_errno = errno;
   if ((term.c_lflag & ECHO) == 0u) {
     if(write(output, "\n", 1) != -1) {