Index: client/Client/TextLabel.cpp
===================================================================
--- client/Client/TextLabel.cpp	(revision 34bd549fb79df6652d25f7cdf8607dd95e60c67a)
+++ client/Client/TextLabel.cpp	(revision 3ea1839b0ef52feb64695e7636ed5521d667953f)
@@ -34,4 +34,5 @@
       default:
          cout << "Invalid alignment: " << this->alignment << endl;
+         targetX = 0;
          break;
    }
Index: common/WorldMap.cpp
===================================================================
--- common/WorldMap.cpp	(revision 34bd549fb79df6652d25f7cdf8607dd95e60c67a)
+++ common/WorldMap.cpp	(revision 3ea1839b0ef52feb64695e7636ed5521d667953f)
@@ -232,13 +232,11 @@
       // read the map dimensions
       getline(file, line);
-      if (line.size() > 0)
-      {
-         istringstream iss(line);
-         string token;
-         getline(iss, token, 'x');
-         width = atoi(token.c_str());
-         getline(iss, token, 'x');
-         height = atoi(token.c_str());
-      }
+
+      istringstream iss(line);
+      string token;
+      getline(iss, token, 'x');
+      width = atoi(token.c_str());
+      getline(iss, token, 'x');
+      height = atoi(token.c_str());
 
       cout << "width: " << width << endl;