Index: server/server.cpp
===================================================================
--- server/server.cpp	(revision 46d64695d8d9b46a9adea74da159caae18698af6)
+++ server/server.cpp	(revision bc702829fa992477124b5b244ae31c4a3d666cdc)
@@ -564,4 +564,6 @@
 
          memcpy(&playerClass, clientMsg.buffer+username.length()+password.length()+2, 4);
+         serverMsg.type = MSG_TYPE_REGISTER;
+
 
          cout << "username: " << username << endl;
@@ -572,15 +574,16 @@
          else if (playerClass == Player::CLASS_RANGER)
             cout << "class: RANGER" << endl;
+         else {
+            cout << "Unknown player class detected" << endl;
+            strcpy(serverMsg.buffer, "You didn't select a class");
+            break;
+         }
+
+         int error = da.insertPlayer(username, password, playerClass);
+
+         if (error)
+            strcpy(serverMsg.buffer, "Registration failed. Please try again.");
          else
-            cout << "Unknown player class detected" << endl;
-
-         int error = da.insertPlayer(username, password, playerClass);
-
-         if (!error)
             strcpy(serverMsg.buffer, "Registration successful.");
-         else
-            strcpy(serverMsg.buffer, "Registration failed. Please try again.");
-
-         serverMsg.type = MSG_TYPE_REGISTER;
 
          break;