diff --git a/src/applications/pholio/controller/PholioMockViewController.php b/src/applications/pholio/controller/PholioMockViewController.php
index 425aab97e1..f13a2d534d 100644
--- a/src/applications/pholio/controller/PholioMockViewController.php
+++ b/src/applications/pholio/controller/PholioMockViewController.php
@@ -134,7 +134,7 @@ final class PholioMockViewController extends PholioController {
     $image = idx($images, $image_id);
 
     if ($image) {
-      $history = $mock->getImageUpdateSet($image_id);
+      $history = $mock->getImageHistorySet($image_id);
       $latest_image = last($history);
       $href = $this->getApplicationURI(
         'image/history/'.$latest_image->getID().'/');
diff --git a/src/applications/pholio/query/PholioMockQuery.php b/src/applications/pholio/query/PholioMockQuery.php
index be350a7a3a..825a38442b 100644
--- a/src/applications/pholio/query/PholioMockQuery.php
+++ b/src/applications/pholio/query/PholioMockQuery.php
@@ -122,7 +122,7 @@ final class PholioMockQuery
     $image_groups = mgroup($all_images, 'getMockID');
 
     foreach ($mocks as $mock) {
-      $mock_images = $image_groups[$mock->getID()];
+      $mock_images = idx($image_groups, $mock->getID(), array());
       $mock->attachAllImages($mock_images);
       $mock->attachImages(mfilter($mock_images, 'getIsObsolete', true));
     }