diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuild.php b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
index 96e25ab239..c569d3cf1b 100644
--- a/src/applications/harbormaster/storage/build/HarbormasterBuild.php
+++ b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
@@ -183,9 +183,12 @@ final class HarbormasterBuild extends HarbormasterDAO
       $repo = $object->getRepository();
     }
 
-    $results['repository.callsign'] = $repo->getCallsign();
-    $results['repository.vcs'] = $repo->getVersionControlSystem();
-    $results['repository.uri'] = $repo->getPublicRemoteURI();
+    if ($repo) {
+      $results['repository.callsign'] = $repo->getCallsign();
+      $results['repository.vcs'] = $repo->getVersionControlSystem();
+      $results['repository.uri'] = $repo->getPublicRemoteURI();
+    }
+
     $results['step.timestamp'] = time();
     $results['build.id'] = $this->getID();