diff --git a/src/applications/pholio/controller/PholioMockViewController.php b/src/applications/pholio/controller/PholioMockViewController.php
index 425aab97e..f13a2d534 100644
--- a/src/applications/pholio/controller/PholioMockViewController.php
+++ b/src/applications/pholio/controller/PholioMockViewController.php
@@ -1,264 +1,264 @@
 <?php
 
 /**
  * @group pholio
  */
 final class PholioMockViewController extends PholioController {
 
   private $id;
   private $imageID;
   private $maniphestTaskPHIDs = array();
 
   private function setManiphestTaskPHIDs($maniphest_task_phids) {
     $this->maniphestTaskPHIDs = $maniphest_task_phids;
     return $this;
   }
   private function getManiphestTaskPHIDs() {
     return $this->maniphestTaskPHIDs;
   }
 
   public function shouldAllowPublic() {
     return true;
   }
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
     $this->imageID = idx($data, 'imageID');
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $mock = id(new PholioMockQuery())
       ->setViewer($user)
       ->withIDs(array($this->id))
       ->needImages(true)
       ->needCoverFiles(true)
       ->executeOne();
 
     if (!$mock) {
       return new Aphront404Response();
     }
 
     $xactions = id(new PholioTransactionQuery())
       ->setViewer($user)
       ->withObjectPHIDs(array($mock->getPHID()))
       ->execute();
 
     $phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
       $mock->getPHID(),
       PhabricatorEdgeConfig::TYPE_MOCK_HAS_TASK);
     $this->setManiphestTaskPHIDs($phids);
     $phids[] = $mock->getAuthorPHID();
     $this->loadHandles($phids);
 
     $engine = id(new PhabricatorMarkupEngine())
       ->setViewer($user);
     $engine->addObject($mock, PholioMock::MARKUP_FIELD_DESCRIPTION);
     foreach ($xactions as $xaction) {
       if ($xaction->getComment()) {
         $engine->addObject(
           $xaction->getComment(),
           PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT);
       }
     }
     $engine->process();
 
     $title = $mock->getName();
 
     $header = id(new PhabricatorHeaderView())
       ->setHeader($title);
 
     $actions = $this->buildActionView($mock);
     $properties = $this->buildPropertyView($mock, $engine);
 
     require_celerity_resource('pholio-css');
     require_celerity_resource('pholio-inline-comments-css');
 
     $image_status = $this->getImageStatus($mock, $this->imageID);
 
     $comment_form_id = celerity_generate_unique_node_id();
     $output = id(new PholioMockImagesView())
       ->setRequestURI($request->getRequestURI())
       ->setCommentFormID($comment_form_id)
       ->setUser($user)
       ->setMock($mock)
       ->setImageID($this->imageID);
 
     $xaction_view = id(new PholioTransactionView())
       ->setUser($this->getRequest()->getUser())
       ->setTransactions($xactions)
       ->setMarkupEngine($engine);
 
     $add_comment = $this->buildAddCommentView($mock, $comment_form_id);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->setActionList($actions);
     $crumbs->addCrumb(
       id(new PhabricatorCrumbView())
         ->setName('M'.$mock->getID())
         ->setHref('/M'.$mock->getID()));
 
     $content = array(
       $crumbs,
       $image_status,
       $header,
       $actions,
       $properties,
       $output->render(),
       $xaction_view,
       $add_comment,
     );
 
     return $this->buildApplicationPage(
       $content,
       array(
         'title' => 'M'.$mock->getID().' '.$title,
         'device' => true,
         'pageObjects' => array($mock->getPHID()),
       ));
   }
 
   private function getImageStatus(PholioMock $mock, $image_id) {
     $status = null;
     $images = $mock->getImages();
     foreach ($images as $image) {
       if ($image->getID() == $image_id) {
         return $status;
       }
     }
 
     $images = $mock->getAllImages();
     $images = mpull($images, null, 'getID');
     $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().'/');
       $status = id(new AphrontErrorView())
         ->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
         ->setTitle(pht('The requested image is obsolete.'))
         ->appendChild(phutil_tag(
           'p',
           array(),
           array(
             pht('You are viewing this mock with the latest image set.'),
             ' ',
             phutil_tag(
               'a',
               array('href' => $href),
               pht(
                 'Click here to see the history of the now obsolete image.')))));
     }
 
     return $status;
   }
 
   private function buildActionView(PholioMock $mock) {
     $user = $this->getRequest()->getUser();
 
     $actions = id(new PhabricatorActionListView())
       ->setUser($user)
       ->setObjectURI($this->getRequest()->getRequestURI())
       ->setObject($mock);
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $user,
       $mock,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $actions->addAction(
       id(new PhabricatorActionView())
       ->setIcon('edit')
       ->setName(pht('Edit Mock'))
       ->setHref($this->getApplicationURI('/edit/'.$mock->getID().'/'))
       ->setDisabled(!$can_edit)
       ->setWorkflow(!$can_edit));
 
     $actions->addAction(
       id(new PhabricatorActionView())
       ->setIcon('attach')
       ->setName(pht('Edit Maniphest Tasks'))
       ->setHref("/search/attach/{$mock->getPHID()}/TASK/edge/")
       ->setDisabled(!$user->isLoggedIn())
       ->setWorkflow(true));
 
     return $actions;
   }
 
   private function buildPropertyView(
     PholioMock $mock,
     PhabricatorMarkupEngine $engine) {
 
     $user = $this->getRequest()->getUser();
 
     $properties = id(new PhabricatorPropertyListView())
       ->setUser($user)
       ->setObject($mock);
 
     $properties->addProperty(
       pht('Author'),
       $this->getHandle($mock->getAuthorPHID())->renderLink());
 
     $properties->addProperty(
       pht('Created'),
       phabricator_datetime($mock->getDateCreated(), $user));
 
     $descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
       $user,
       $mock);
 
     $properties->addProperty(
       pht('Visible To'),
       $descriptions[PhabricatorPolicyCapability::CAN_VIEW]);
 
     if ($this->getManiphestTaskPHIDs()) {
       $properties->addProperty(
         pht('Maniphest Tasks'),
         $this->renderHandlesForPHIDs($this->getManiphestTaskPHIDs()));
     }
 
     $properties->invokeWillRenderEvent();
 
     $properties->addImageContent(
       $engine->getOutput($mock, PholioMock::MARKUP_FIELD_DESCRIPTION));
 
     return $properties;
   }
 
   private function buildAddCommentView(PholioMock $mock, $comment_form_id) {
     $user = $this->getRequest()->getUser();
 
     $draft = PhabricatorDraft::newFromUserAndKey($user, $mock->getPHID());
 
     $is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
 
     $title = $is_serious
       ? pht('Add Comment')
       : pht('History Beckons');
 
     $header = id(new PhabricatorHeaderView())
       ->setHeader($title);
 
     $button_name = $is_serious
       ? pht('Add Comment')
       : pht('Answer The Call');
 
     $form = id(new PhabricatorApplicationTransactionCommentView())
       ->setUser($user)
       ->setFormID($comment_form_id)
       ->setDraft($draft)
       ->setSubmitButtonName($button_name)
       ->setAction($this->getApplicationURI('/comment/'.$mock->getID().'/'))
       ->setRequestURI($this->getRequest()->getRequestURI());
 
     return array(
       $header,
       $form,
     );
   }
 
 }
diff --git a/src/applications/pholio/query/PholioMockQuery.php b/src/applications/pholio/query/PholioMockQuery.php
index be350a7a3..825a38442 100644
--- a/src/applications/pholio/query/PholioMockQuery.php
+++ b/src/applications/pholio/query/PholioMockQuery.php
@@ -1,160 +1,160 @@
 <?php
 
 /**
  * @group pholio
  */
 final class PholioMockQuery
   extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $ids;
   private $phids;
   private $authorPHIDs;
 
   private $needCoverFiles;
   private $needImages;
   private $needInlineComments;
   private $needTokenCounts;
 
   public function withIDs(array $ids) {
     $this->ids = $ids;
     return $this;
   }
 
   public function withPHIDs(array $phids) {
     $this->phids = $phids;
     return $this;
   }
 
   public function withAuthorPHIDs(array $author_phids) {
     $this->authorPHIDs = $author_phids;
     return $this;
   }
 
   public function needCoverFiles($need_cover_files) {
     $this->needCoverFiles = $need_cover_files;
     return $this;
   }
 
   public function needImages($need_images) {
     $this->needImages = $need_images;
     return $this;
   }
 
   public function needInlineComments($need_inline_comments) {
     $this->needInlineComments = $need_inline_comments;
     return $this;
   }
 
   public function needTokenCounts($need) {
     $this->needTokenCounts = $need;
     return $this;
   }
 
   protected function loadPage() {
     $table = new PholioMock();
     $conn_r = $table->establishConnection('r');
 
     $data = queryfx_all(
       $conn_r,
       'SELECT * FROM %T %Q %Q %Q',
       $table->getTableName(),
       $this->buildWhereClause($conn_r),
       $this->buildOrderClause($conn_r),
       $this->buildLimitClause($conn_r));
 
     $mocks = $table->loadAllFromArray($data);
 
     if ($mocks && $this->needImages) {
       $this->loadImages($mocks);
     }
 
     if ($mocks && $this->needCoverFiles) {
       $this->loadCoverFiles($mocks);
     }
 
     if ($mocks && $this->needTokenCounts) {
       $this->loadTokenCounts($mocks);
     }
 
     return $mocks;
   }
 
   private function buildWhereClause(AphrontDatabaseConnection $conn_r) {
     $where = array();
 
     $where[] = $this->buildPagingClause($conn_r);
 
     if ($this->ids) {
       $where[] = qsprintf(
         $conn_r,
         'id IN (%Ld)',
         $this->ids);
     }
 
     if ($this->phids) {
       $where[] = qsprintf(
         $conn_r,
         'phid IN (%Ls)',
         $this->phids);
     }
 
     if ($this->authorPHIDs) {
       $where[] = qsprintf(
         $conn_r,
         'authorPHID in (%Ls)',
         $this->authorPHIDs);
     }
 
     return $this->formatWhereClause($where);
   }
 
   private function loadImages(array $mocks) {
     assert_instances_of($mocks, 'PholioMock');
 
     $mock_map = mpull($mocks, null, 'getID');
     $all_images = id(new PholioImageQuery())
       ->setViewer($this->getViewer())
       ->setMockCache($mock_map)
       ->withMockIDs(array_keys($mock_map))
       ->needInlineComments($this->needInlineComments)
       ->execute();
 
     $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));
     }
   }
 
   private function loadCoverFiles(array $mocks) {
     assert_instances_of($mocks, 'PholioMock');
     $cover_file_phids = mpull($mocks, 'getCoverPHID');
     $cover_files = mpull(id(new PhabricatorFile())->loadAllWhere(
       'phid IN (%Ls)',
       $cover_file_phids), null, 'getPHID');
 
     foreach ($mocks as $mock) {
       $file = idx($cover_files, $mock->getCoverPHID());
       if (!$file) {
         $file = PhabricatorFile::loadBuiltin($this->getViewer(), 'missing.png');
       }
       $mock->attachCoverFile($file);
     }
   }
 
   private function loadTokenCounts(array $mocks) {
     assert_instances_of($mocks, 'PholioMock');
 
     $phids = mpull($mocks, 'getPHID');
     $counts = id(new PhabricatorTokenCountQuery())
       ->withObjectPHIDs($phids)
       ->execute();
 
     foreach ($mocks as $mock) {
       $mock->attachTokenCount(idx($counts, $mock->getPHID(), 0));
     }
   }
 
 }