diff --git a/src/applications/repository/customfield/PhabricatorCommitTagsField.php b/src/applications/repository/customfield/PhabricatorCommitTagsField.php
index b69d246d85..001d81e960 100644
--- a/src/applications/repository/customfield/PhabricatorCommitTagsField.php
+++ b/src/applications/repository/customfield/PhabricatorCommitTagsField.php
@@ -1,46 +1,51 @@
 <?php
 
 final class PhabricatorCommitTagsField
   extends PhabricatorCommitCustomField {
 
   public function getFieldKey() {
     return 'diffusion:tags';
   }
 
   public function getFieldName() {
     return pht('Tags');
   }
 
   public function getFieldDescription() {
     return pht('Shows commit tags in email.');
   }
 
   public function shouldAppearInTransactionMail() {
     return true;
   }
 
   public function updateTransactionMailBody(
     PhabricatorMetaMTAMailBody $body,
     PhabricatorApplicationTransactionEditor $editor,
     array $xactions) {
 
     $params = array(
       'commit' => $this->getObject()->getCommitIdentifier(),
       'callsign' => $this->getObject()->getRepository()->getCallsign(),
     );
 
-    $tags_raw = id(new ConduitCall('diffusion.tagsquery', $params))
-      ->setUser($this->getViewer())
-      ->execute();
-
-    $tags = DiffusionRepositoryTag::newFromConduit($tags_raw);
-    if (!$tags) {
-      return;
+    try {
+      $tags_raw = id(new ConduitCall('diffusion.tagsquery', $params))
+        ->setUser($this->getViewer())
+        ->execute();
+
+      $tags = DiffusionRepositoryTag::newFromConduit($tags_raw);
+      if (!$tags) {
+        return;
+      }
+      $tag_names = mpull($tags, 'getName');
+      sort($tag_names);
+      $tag_names = implode(', ', $tag_names);
+    } catch (Exception $ex) {
+      $tag_names = pht('<%s: %s>', get_class($ex), $ex->getMessage());
     }
-    $tag_names = mpull($tags, 'getName');
-    sort($tag_names);
 
-    $body->addTextSection(pht('TAGS'), implode(', ', $tag_names));
+    $body->addTextSection(pht('TAGS'), $tag_names);
   }
 
 }