diff --git a/src/applications/differential/field/specification/DifferentialUnitFieldSpecification.php b/src/applications/differential/field/specification/DifferentialUnitFieldSpecification.php
index 6b91e90f43..9cfd7b69ee 100644
--- a/src/applications/differential/field/specification/DifferentialUnitFieldSpecification.php
+++ b/src/applications/differential/field/specification/DifferentialUnitFieldSpecification.php
@@ -1,223 +1,226 @@
 <?php
 
 final class DifferentialUnitFieldSpecification
   extends DifferentialFieldSpecification {
 
   public function shouldAppearOnDiffView() {
       return true;
   }
 
   public function renderLabelForDiffView() {
     return $this->renderLabelForRevisionView();
   }
 
   public function renderValueForDiffView() {
     return $this->renderValueForRevisionView();
   }
 
   public function shouldAppearOnRevisionView() {
     return true;
   }
 
   public function renderLabelForRevisionView() {
     return 'Unit:';
   }
 
   private function getUnitExcuse() {
     return $this->getDiffProperty('arc:unit-excuse');
   }
 
   public function renderValueForRevisionView() {
     $diff = $this->getManualDiff();
 
     $ustar = DifferentialRevisionUpdateHistoryView::renderDiffUnitStar($diff);
     $umsg = DifferentialRevisionUpdateHistoryView::getDiffUnitMessage($diff);
 
     $rows = array();
 
     $rows[] = array(
       'style' => 'star',
       'name'  => $ustar,
       'value' => $umsg,
       'show'  => true,
     );
 
     $excuse = $this->getUnitExcuse();
     if ($excuse) {
       $rows[] = array(
         'style' => 'excuse',
         'name'  => 'Excuse',
         'value' => phutil_escape_html_newlines($excuse),
         'show'  => true,
       );
     }
 
     $show_limit = 10;
     $hidden = array();
 
     $udata = $this->getDiffProperty('arc:unit');
     if ($udata) {
       $sort_map = array(
         ArcanistUnitTestResult::RESULT_BROKEN     => 0,
         ArcanistUnitTestResult::RESULT_FAIL       => 1,
         ArcanistUnitTestResult::RESULT_UNSOUND    => 2,
         ArcanistUnitTestResult::RESULT_SKIP       => 3,
         ArcanistUnitTestResult::RESULT_POSTPONED  => 4,
         ArcanistUnitTestResult::RESULT_PASS       => 5,
       );
 
       foreach ($udata as $key => $test) {
         $udata[$key]['sort'] = idx($sort_map, idx($test, 'result'));
       }
       $udata = isort($udata, 'sort');
 
       foreach ($udata as $test) {
         $result = idx($test, 'result');
 
         $default_hide = false;
         switch ($result) {
           case ArcanistUnitTestResult::RESULT_POSTPONED:
           case ArcanistUnitTestResult::RESULT_PASS:
             $default_hide = true;
             break;
         }
 
         if ($show_limit && !$default_hide) {
           --$show_limit;
           $show = true;
         } else {
           $show = false;
           if (empty($hidden[$result])) {
             $hidden[$result] = 0;
           }
           $hidden[$result]++;
         }
 
         $value = idx($test, 'name');
         if (!empty($test['link'])) {
           $value = phutil_tag(
             'a',
             array(
               'href' => $test['link'],
               'target' => '_blank',
             ),
             $value);
         }
         $rows[] = array(
           'style' => $this->getResultStyle($result),
           'name'  => ucwords($result),
           'value' => $value,
           'show'  => $show,
         );
 
         $userdata = idx($test, 'userdata');
         if ($userdata) {
+          if ($userdata !== false) {
+            $userdata = str_replace("\000", '', $userdata);
+          }
           $engine = PhabricatorMarkupEngine::newDifferentialMarkupEngine();
           $userdata = $engine->markupText($userdata);
           $rows[] = array(
             'style' => 'details',
             'value' => $userdata,
             'show'  => false,
           );
           if (empty($hidden['details'])) {
             $hidden['details'] = 0;
           }
           $hidden['details']++;
         }
       }
     }
 
     $show_string = $this->renderShowString($hidden);
 
     $view = new DifferentialResultsTableView();
     $view->setRows($rows);
     $view->setShowMoreString($show_string);
 
     return $view->render();
   }
 
   private function getResultStyle($result) {
     $map = array(
       ArcanistUnitTestResult::RESULT_PASS       => 'green',
       ArcanistUnitTestResult::RESULT_FAIL       => 'red',
       ArcanistUnitTestResult::RESULT_SKIP       => 'blue',
       ArcanistUnitTestResult::RESULT_BROKEN     => 'red',
       ArcanistUnitTestResult::RESULT_UNSOUND    => 'yellow',
       ArcanistUnitTestResult::RESULT_POSTPONED  => 'blue',
     );
     return idx($map, $result);
   }
 
   private function renderShowString(array $hidden) {
     if (!$hidden) {
       return null;
     }
 
     // Reorder hidden things by severity.
     $hidden = array_select_keys(
       $hidden,
       array(
         ArcanistUnitTestResult::RESULT_BROKEN,
         ArcanistUnitTestResult::RESULT_FAIL,
         ArcanistUnitTestResult::RESULT_UNSOUND,
         ArcanistUnitTestResult::RESULT_SKIP,
         ArcanistUnitTestResult::RESULT_POSTPONED,
         ArcanistUnitTestResult::RESULT_PASS,
         'details',
       )) + $hidden;
 
     $noun = array(
       ArcanistUnitTestResult::RESULT_BROKEN     => 'Broken',
       ArcanistUnitTestResult::RESULT_FAIL       => 'Failed',
       ArcanistUnitTestResult::RESULT_UNSOUND    => 'Unsound',
       ArcanistUnitTestResult::RESULT_SKIP       => 'Skipped',
       ArcanistUnitTestResult::RESULT_POSTPONED  => 'Postponed',
       ArcanistUnitTestResult::RESULT_PASS       => 'Passed',
     );
 
     $show = array();
     foreach ($hidden as $key => $value) {
       if ($key == 'details') {
         $show[] = pht('%d Detail(s)', $value);
       } else {
         $show[] = $value.' '.idx($noun, $key);
       }
     }
 
     return "Show Full Unit Results (".implode(', ', $show).")";
   }
 
   public function renderWarningBoxForRevisionAccept() {
     $diff = $this->getDiff();
     $unit_warning = null;
     if ($diff->getUnitStatus() >= DifferentialUnitStatus::UNIT_WARN) {
       $titles =
         array(
           DifferentialUnitStatus::UNIT_WARN => 'Unit Tests Warning',
           DifferentialUnitStatus::UNIT_FAIL => 'Unit Tests Failure',
           DifferentialUnitStatus::UNIT_SKIP => 'Unit Tests Skipped',
           DifferentialUnitStatus::UNIT_POSTPONED => 'Unit Tests Postponed'
         );
       if ($diff->getUnitStatus() == DifferentialUnitStatus::UNIT_POSTPONED) {
         $content =
           "This diff has postponed unit tests. The results should be ".
           "coming in soon. You should probably wait for them before accepting ".
           "this diff.";
       } else if ($diff->getUnitStatus() == DifferentialUnitStatus::UNIT_SKIP) {
         $content =
           "Unit tests were skipped when this diff was created. Make sure ".
           "you are OK with that before you accept this diff.";
       } else {
         $content =
           "This diff has Unit Test Problems. Make sure you are OK with ".
           "them before you accept this diff.";
       }
       $unit_warning = id(new AphrontErrorView())
         ->setSeverity(AphrontErrorView::SEVERITY_ERROR)
         ->appendChild(phutil_tag('p', array(), $content))
         ->setTitle(idx($titles, $diff->getUnitStatus(), 'Warning'));
     }
     return $unit_warning;
   }
 
 }