Never null

src/engine/objects/City.java

@@ -640,19 +640,12 @@ public class City extends AbstractWorldObject {
     public Guild getGuild() {
 
         if (this.getTOL() == null)
-            return null;
+            return Guild.getErrantGuild();
-
-        if (this.isNpc == 1) {
 
-            if (this.getTOL().getOwner() == null)
+        if (this.getTOL().getOwner() == null)
-                return null;
+            return Guild.getErrantGuild();
-            return this.getTOL().getOwner().getGuild();
-        } else {
 
-            if (this.getTOL().getOwner() == null)
+        return this.getTOL().getOwner().getGuild();
-                return null;
-            return this.getTOL().getOwner().getGuild();
-        }
     }
 
     public boolean openCity(boolean open) {