diff --git a/src/applications/harbormaster/controller/HarbormasterBuildableListController.php b/src/applications/harbormaster/controller/HarbormasterBuildableListController.php
index d8e72971f7..130a20470d 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildableListController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildableListController.php
@@ -37,8 +37,12 @@ final class HarbormasterBuildableListController
 
       $item = id(new PHUIObjectItemView())
         ->setHeader(pht('Buildable %d', $buildable->getID()));
-      $item->addAttribute($buildable->getContainerHandle()->getName());
-      $item->addAttribute($buildable->getBuildableHandle()->getFullName());
+      if ($buildable->getContainerHandle() !== null) {
+        $item->addAttribute($buildable->getContainerHandle()->getName());
+      }
+      if ($buildable->getBuildableHandle() !== null) {
+        $item->addAttribute($buildable->getBuildableHandle()->getFullName());
+      }
 
       if ($id) {
         $item->setHref("/B{$id}");