diff --git a/gameserver/src/main/java/brainwine/gameserver/entity/player/PlayerManager.java b/gameserver/src/main/java/brainwine/gameserver/entity/player/PlayerManager.java
index 6ea0dac..23f5f8b 100644
--- a/gameserver/src/main/java/brainwine/gameserver/entity/player/PlayerManager.java
+++ b/gameserver/src/main/java/brainwine/gameserver/entity/player/PlayerManager.java
@@ -105,7 +105,7 @@ public class PlayerManager {
     
     public boolean verifyPassword(String name, String password) {
         Player player = getPlayer(name);
-        return player == null ? false : BCrypt.checkpw(password, player.getPassword());
+        return player == null ? false : player.getPassword() == null ? false : BCrypt.checkpw(password, player.getPassword());
     }
     
     public boolean verifyAuthToken(String name, String token) {