diff --git a/lib/Lacuna/DB/Result/Map/StarLite.pm b/lib/Lacuna/DB/Result/Map/StarLite.pm
index fb26c0a5..85e42d00 100644
--- a/lib/Lacuna/DB/Result/Map/StarLite.pm
+++ b/lib/Lacuna/DB/Result/Map/StarLite.pm
@@ -77,7 +77,7 @@ __PACKAGE__->result_source_instance->view_definition(q[
 sub body_image {
     my ($self) = @_;
 
-    my ($image) = $self->body_class =~ m/:(\d+)$/;
+    my ($image) = $self->body_class =~ m/:(\w+)$/;
     $image =~ s/G/pg/;
     $image =~ s/P/p/;
     $image =~ s/A/a/;
diff --git a/lib/Lacuna/DB/ResultSet/Map/StarLite.pm b/lib/Lacuna/DB/ResultSet/Map/StarLite.pm
index d641651b..2b5df0fe 100644
--- a/lib/Lacuna/DB/ResultSet/Map/StarLite.pm
+++ b/lib/Lacuna/DB/ResultSet/Map/StarLite.pm
@@ -46,7 +46,7 @@ sub get_star_map {
             push @{$star->{bodies}}, $body;
         }
     }
-    push @out, $star;
+    push @out, $star if defined $star;
 
     return {
         stars => \@out,
diff --git a/lib/Lacuna/RPC/Map.pm b/lib/Lacuna/RPC/Map.pm
index 6d8538cd..4c00ee70 100644
--- a/lib/Lacuna/RPC/Map.pm
+++ b/lib/Lacuna/RPC/Map.pm
@@ -55,11 +55,10 @@ sub get_star_map {
     my $empire = $self->get_empire_by_session($args->{session_id});
     my $alliance_id = $empire->alliance_id || 0;
 
-    my @out = Lacuna->db->resultset('Map::StarLite')->get_star_map( $alliance_id, $empire->id, $args->{left}, $args->{right}, $args->{bottom}, $args->{top} );
-    return { 
-        stars   => \@out,
-        status  => $self->format_status($empire),
-    };
+    my $out = Lacuna->db->resultset('Map::StarLite')->get_star_map( $alliance_id, $empire->id, $args->{left}, $args->{right}, $args->{bottom}, $args->{top} );
+    $out->{status} = $self->format_status($empire);
+
+    return $out;
 }
 
 sub get_stars {