Null value for password field should not cause NPE #1025