diff --git a/lib/Lacuna/DB/Result/Building.pm b/lib/Lacuna/DB/Result/Building.pm
index cbdfc485..0c5f8414 100755
--- a/lib/Lacuna/DB/Result/Building.pm
+++ b/lib/Lacuna/DB/Result/Building.pm
@@ -849,7 +849,12 @@ sub finish_upgrade {
         $body->needs_surface_refresh(1);
         $body->update;
         my $empire = $body->empire; 
-        $empire->add_medal('building'.$self->level);
+        if ($self->level >= 1 and $self->level <= 30) {
+            $empire->add_medal('building'.$self->level);
+        }
+        else {
+            $empire->add_medal('buildingX');
+        }
         my $type = $self->controller_class;
         $type =~ s/^Lacuna::RPC::Building::(\w+)$/$1/;
 
diff --git a/lib/Lacuna/DB/Result/Medals.pm b/lib/Lacuna/DB/Result/Medals.pm
index 84c3c055..48b52d69 100644
--- a/lib/Lacuna/DB/Result/Medals.pm
+++ b/lib/Lacuna/DB/Result/Medals.pm
@@ -184,6 +184,7 @@ use constant MEDALS => {
     A23                             => 'Mined A23 Type Asteroid',
     A24                             => 'Mined A24 Type Asteroid',
     A25                             => 'Mined A25 Type Asteroid',
+    buildingX                       => 'Built Building outside range',
     building1                       => 'Built Level 1 Building',
     building2                       => 'Built Level 2 Building',
     building3                       => 'Built Level 3 Building',