diff --git a/src/engine/objects/Guild.java b/src/engine/objects/Guild.java
index d37efa76..96b157f2 100644
--- a/src/engine/objects/Guild.java
+++ b/src/engine/objects/Guild.java
@@ -820,12 +820,16 @@ public class Guild extends AbstractWorldObject {
         if (!DbManager.GuildQueries.UPDATE_PARENT(subGuild.getObjectUUID(), WorldServer.worldUUID))
             Logger.debug("Failed to set Nation Guild for Guild with UID " + subGuild.getObjectUUID());
 
-        if (subGuild.getOwnedCity() == null) {
-            subGuild.guildState = GuildState.Errant;
-            subGuild.nation = Guild.getErrantNation();
-        } else {
-            subGuild.nation = subGuild;
-            subGuild.guildState = GuildState.Sovereign;
+        switch (subGuild.guildState) {
+            case Sworn:
+                subGuild.guildState = GuildState.Errant;
+                subGuild.nation = Guild.getErrantNation();
+                break;
+            case Protectorate:
+            case Petitioner:
+                subGuild.nation = subGuild;
+                subGuild.guildState = GuildState.Sovereign;
+                break;
         }
 
         // Remove from collection