diff --git a/src/applications/diffusion/controller/file/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/file/DiffusionBrowseFileController.php
index a0ac7b1a1d..859420fa64 100644
--- a/src/applications/diffusion/controller/file/DiffusionBrowseFileController.php
+++ b/src/applications/diffusion/controller/file/DiffusionBrowseFileController.php
@@ -223,7 +223,11 @@ class DiffusionBrowseFileController extends DiffusionController {
         $rows = array();
         foreach ($text_list as $k => $line) {
           $rev = $rev_list[$k];
-          $author = $blame_dict[$rev]['author'];
+          if (isset($blame_dict[$rev]['handle'])) {
+            $author = $blame_dict[$rev]['handle']->getName();
+          } else {
+            $author = $blame_dict[$rev]['author'];
+          }
           $rows[] =
             sprintf("%-10s %-20s %s", substr($rev, 0, 7), $author, $line);
         }
@@ -328,7 +332,11 @@ class DiffusionBrowseFileController extends DiffusionController {
               '; width: 2em;">' . $prev_link . '</th>';
           }
 
-          $author_link = $blame_dict[$rev]['author'];
+          if (isset($blame_dict[$rev]['handle'])) {
+            $author_link = $blame_dict[$rev]['handle']->renderLink();
+          } else {
+            $author_link = phutil_escape_html($blame_dict[$rev]['author']);
+          }
           $blame_info =
             $prev_link .
             '<th style="background: '.$color.
diff --git a/src/applications/diffusion/query/filecontent/base/DiffusionFileContentQuery.php b/src/applications/diffusion/query/filecontent/base/DiffusionFileContentQuery.php
index 37cf98c468..c4b6f332f1 100644
--- a/src/applications/diffusion/query/filecontent/base/DiffusionFileContentQuery.php
+++ b/src/applications/diffusion/query/filecontent/base/DiffusionFileContentQuery.php
@@ -126,8 +126,8 @@ abstract class DiffusionFileContentQuery {
         if ($data->getCommitDetail('authorPHID')) {
           $commit_identifier =
             $commits[$data->getCommitID()]->getCommitIdentifier();
-          $blame_dict[$commit_identifier]['author'] =
-            $handles[$data->getCommitDetail('authorPHID')]->renderLink();
+          $blame_dict[$commit_identifier]['handle'] =
+            $handles[$data->getCommitDetail('authorPHID')];
         }
       }
    }