Index: server/DataAccess.cpp
===================================================================
--- server/DataAccess.cpp	(revision 521c88b9fbbaf5e789f2d4f2cedd46d4d6b31752)
+++ server/DataAccess.cpp	(revision 147f662d427135b91ad89e0e6b5172bddaa8985b)
@@ -84,6 +84,11 @@
       cout << "Creating a new player" << endl;
       p = new Player(string(row[1]), string(row[2]));
-      p->setClass((Player::PlayerClass)atoi(row[3]));
-      cout << "Class from db: " << atoi(row[3]) << endl;
+      if (row[3] == NULL) {
+         p->setClass(Player::CLASS_NONE);
+         cout << "Class from db was NULL" << endl;
+      }else {
+         p->setClass((Player::PlayerClass)atoi(row[3]));
+         cout << "Class from db: " << atoi(row[3]) << endl;
+      }
       cout << "Player class: " << p->playerClass << endl;
       cout << "Created new player" << endl;