diff --git a/src/org/apollo/net/codec/login/LoginDecoder.java b/src/org/apollo/net/codec/login/LoginDecoder.java
index 71bc853b..f49a8da4 100644
--- a/src/org/apollo/net/codec/login/LoginDecoder.java
+++ b/src/org/apollo/net/codec/login/LoginDecoder.java
@@ -182,6 +182,10 @@ public final class LoginDecoder extends StatefulFrameDecoder<LoginDecoderState>
 			if (username.length() > 12 || password.length() > 20) {
 				throw new Exception("Username or password too long.");
 			}
+			
+			if (username.equals("") || password.equals("")) {
+				throw new Exception("Invalid username or password.");
+			}
 
 			int[] seed = new int[4];
 			seed[0] = (int) (clientSeed >> 32);
@@ -209,4 +213,4 @@ public final class LoginDecoder extends StatefulFrameDecoder<LoginDecoderState>
 		}
 	}
 
-}
\ No newline at end of file
+}