diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c
index 71a0ca3a7..449519946 100644
--- a/src/common/kernel/xmlreader.c
+++ b/src/common/kernel/xmlreader.c
@@ -648,7 +648,7 @@ xml_readweapon(xmlXPathContextPtr xpath, item_type * itype)
       property = xmlGetProp(node, BAD_CAST "name");
       if (property!=NULL) {
         const race * rc = rc_find((const char*)property);
-        assert(rc!=NULL);
+        if (rc==NULL) rc = rc_add(rc_new((const char*)property));
         racelist_insert(&wtype->modifiers[k].races, rc);
         xmlFree(property);
       }
@@ -1327,12 +1327,13 @@ parse_races(xmlDocPtr doc)
       xmlNodePtr node = result->nodesetval->nodeTab[k];
       xmlChar * property = xmlGetProp(node, BAD_CAST "spell");
       if (property!=NULL) {
-        const spell * sp = find_spell(M_NONE, (const char *)property);
+        const spell * sp = NULL;
+        int i = atoi((const char *)property);
+        if (i>0) {
+          sp = find_spellbyid((spellid_t)i);
+        }
         if (sp==NULL) {
-          int i = atoi((const char *)property);
-          if (i>0) {
-            sp = find_spellbyid((spellid_t)i);
-          }
+          sp = find_spell(M_NONE, (const char *)property);
         }
         assert(sp);
         rc->precombatspell = sp;
@@ -1634,12 +1635,12 @@ register_xmlreader(void)
   xml_register_callback(parse_strings);
   xml_register_callback(parse_prefixes);
   xml_register_callback(parse_messages);
-
-  xml_register_callback(parse_races);
   xml_register_callback(parse_resources);
-  xml_register_callback(parse_buildings);
-  xml_register_callback(parse_ships);
-  xml_register_callback(parse_equipment);
+
+  xml_register_callback(parse_buildings); /* requires resources */
+  xml_register_callback(parse_ships); /* requires resources */
+  xml_register_callback(parse_equipment); /* requires resources */
+  xml_register_callback(parse_spells); /* requires resources */
+  xml_register_callback(parse_races); /* requires spells */
   xml_register_callback(parse_calendar);
-  xml_register_callback(parse_spells);
 }
diff --git a/src/res/races.xml b/src/res/races.xml
index c6b291b91..abf987322 100644
--- a/src/res/races.xml
+++ b/src/res/races.xml
@@ -1295,8 +1295,8 @@
     <attack type="4" damage="3d20"/>
     <attack type="4" damage="5d30"/>
     <attack type="6" spell="174"/>
-    <attack type="6" spell="175"/>
-    <precombatspell spell="176"/>
+    <attack type="6" spell="aura_of_fear"/>
+    <precombatspell spell="shadowcall"/>
   </race>
   <race name="shadowbat" magres="0.800000" maxaura="0.000000" regaura="0.000000" recruitcost="500" weight="500" capacity="200" speed="1.000000" hp="1" ac="4" damage="2d4" unarmedattack="0" unarmeddefense="0" attackmodifier="3" defensemodifier="3" scarepeasants="yes" fly="yes" walk="yes" teach="no" getitem="yes">
     <ai splitsize="5000" killpeasants="yes"/>
@@ -1340,7 +1340,7 @@
     <attack type="4" damage="3d20"/>
     <attack type="4" damage="5d30"/>
     <attack type="6" spell="83"/>
-    <attack type="6" spell="175"/>
+    <attack type="6" spell="aura_of_fear"/>
   </race>
   <race name="littlescarab" magres="0.000000" maxaura="0.000000" regaura="0.000000" recruitcost="50" weight="500" capacity="200" speed="1.000000" hp="25" ac="1" damage="2d6" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="3" walk="yes" teach="no" giveitem="yes" getitem="yes">
     <ai splitsize="5000"/>
@@ -1390,8 +1390,8 @@
     <attack type="4" damage="3d20"/>
     <attack type="4" damage="5d30"/>
     <attack type="6" spell="174"/>
-    <attack type="6" spell="175"/>
-    <precombatspell spell="176"/>
+    <attack type="6" spell="aura_of_fear"/>
+    <precombatspell spell="shadowcall"/>
   </race>
   <race name="mummy" magres="0.600000" maxaura="1.000000" regaura="1.000000" recruitcost="5" weight="1000" capacity="540" speed="1.000000" hp="60" ac="2" damage="1d7" unarmedattack="6" unarmeddefense="6" attackmodifier="6" defensemodifier="6" scarepeasants="yes" walk="yes" teach="no" noheal="yes" undead="yes" equipment="yes" nogive="yes">
     <ai splitsize="10000" moverandom="yes"/>