diff --git a/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm b/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm
index e4447765..e8a8a2c4 100644
--- a/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm
+++ b/lib/Lacuna/RPC/Building/BlackHoleGenerator.pm
@@ -432,6 +432,7 @@ sub check_neutral_violation {
     elsif ($task->{name} eq "Move System") {
         my $bodies = Lacuna->db->resultset('Map::Body')->search({star_id => [ $body->star_id ]});
         while (my $obody = $bodies->next) {
+            next unless (defined($obody->empire));
             if ( $obody->has_outgoing_ships(100) ) {
                 $throw = 1009;
                 $reason = sprintf("Colony %s has travelling ships, disallowing a jump to the Neutral Area.", $obody->name);
diff --git a/lib/Lacuna/RPC/Chat.pm b/lib/Lacuna/RPC/Chat.pm
index f5e46bfc..b241d889 100644
--- a/lib/Lacuna/RPC/Chat.pm
+++ b/lib/Lacuna/RPC/Chat.pm
@@ -64,9 +64,12 @@ sub init_chat {
 	    }
         }
     }
-    if ($empire->chat_admin) {
+    if ($empire->is_admin) {
         $chat_name .= " <ADMIN>";
     }
+    elsif ($empire->chat_admin) {
+        $chat_name .= " <MOD>";
+    }
     my $gravatar_id = gravatar_id($empire->email);
     my $gravatar_url = gravatar_url(
         email   => $empire->email,