diff --git a/src/common/items/phoenixcompass.c b/src/common/items/phoenixcompass.c
index 9812c2806..37d896a37 100644
--- a/src/common/items/phoenixcompass.c
+++ b/src/common/items/phoenixcompass.c
@@ -17,6 +17,7 @@
 
 /* kernel includes */
 #include <kernel/item.h>
+#include <kernel/race.h>
 #include <kernel/region.h>
 #include <kernel/faction.h>
 #include <kernel/unit.h>
diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c
index 554a4eb6e..0e1fdaf8e 100644
--- a/src/common/kernel/xmlreader.c
+++ b/src/common/kernel/xmlreader.c
@@ -552,14 +552,19 @@ race_compat(void)
   int i;
 
   for (i=0;i!=MAXRACES;++i) {
-    race * rc = rc_find(oldracenames[i]);
-    if (rc) {
-      new_race[i] = rc;
-      if (rc == new_race[RC_TROLL]) {
-        a_add(&rc->attribs, make_skillmod(NOSKILL, SMF_RIDING, NULL, 0.0, -1));
-      }
+    const char * rcname = oldracenames[i];
+    if (rcname==NULL) {
+      new_race[i] = NULL;
     } else {
-      log_warning(("could not find old race %s\n", oldracenames[i]));
+      race * rc = rc_find(oldracenames[i]);
+      if (rc) {
+        new_race[i] = rc;
+        if (rc == new_race[RC_TROLL]) {
+          a_add(&rc->attribs, make_skillmod(NOSKILL, SMF_RIDING, NULL, 0.0, -1));
+        }
+      } else {
+        log_warning(("could not find old race %s\n", oldracenames[i]));
+      }
     }
   }
 }