diff --git a/src/engine/net/client/handlers/AbandonAssetMsgHandler.java b/src/engine/net/client/handlers/AbandonAssetMsgHandler.java
index 461be7b3..a1a9f829 100644
--- a/src/engine/net/client/handlers/AbandonAssetMsgHandler.java
+++ b/src/engine/net/client/handlers/AbandonAssetMsgHandler.java
@@ -3,7 +3,6 @@ package engine.net.client.handlers;
 import engine.gameManager.*;
 import engine.mbEnums;
 import engine.mbEnums.BuildingGroup;
-import engine.mbEnums.GuildState;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.AbandonAssetMsg;
 import engine.net.client.msg.ClientNetMsg;
@@ -173,11 +172,9 @@ public class AbandonAssetMsgHandler extends AbstractClientMsgHandler {
             BuildingManager.setRank(targetBuilding, 7);
         }
 
-        if (sourceGuild.guildState.equals(GuildState.Sovereign))
-            sourceGuild.guildState = GuildState.Errant;
-        else
-            sourceGuild.guildState = GuildState.Sworn;
-
+        sourceGuild.guildState = mbEnums.GuildState.Errant;
+        sourceGuild.getNation().getSubGuildList().remove(sourceGuild);
+        sourceGuild.setNation(Guild.getErrantNation());
         sourceGuild.setCityUUID(0);
         GuildManager.updateAllGuildTags(sourceGuild);
         GuildManager.updateAllGuildBinds(sourceGuild, null);