diff --git a/src/kernel/faction.c b/src/kernel/faction.c
index 3c864e9a8..9496e3d46 100755
--- a/src/kernel/faction.c
+++ b/src/kernel/faction.c
@@ -426,9 +426,6 @@ void destroyfaction(faction ** fp)
     f->next = dead_factions;
     dead_factions = f;
 
-    fset(f, FFL_QUIT);
-    f->_alive = false;
-
     if (f->spellbook) {
         spellbook_clear(f->spellbook);
         free(f->spellbook);
@@ -481,6 +478,8 @@ void destroyfaction(faction ** fp)
         setalliance(f, NULL);
     }
 
+    fset(f, FFL_QUIT);
+    f->_alive = false;
     funhash(f);
 
     /* units of other factions that were disguised as this faction
diff --git a/src/spells/combatspells.c b/src/spells/combatspells.c
index e8a1be274..695c5204a 100644
--- a/src/spells/combatspells.c
+++ b/src/spells/combatspells.c
@@ -963,8 +963,7 @@ int sp_hero(struct castorder * co)
         }
     }
 
-    m =
-        msg_message("cast_hero_effect", "mage spell amount", fi->unit, sp, targets);
+    m = msg_message("cast_hero_effect", "mage spell amount", fi->unit, sp, targets);
     message_all(b, m);
     msg_release(m);