diff --git a/src/applications/differential/field/specification/revisionstatus/DifferentialRevisionStatusFieldSpecification.php b/src/applications/differential/field/specification/revisionstatus/DifferentialRevisionStatusFieldSpecification.php
index 5fae5f7f0d..d79a7d4f63 100644
--- a/src/applications/differential/field/specification/revisionstatus/DifferentialRevisionStatusFieldSpecification.php
+++ b/src/applications/differential/field/specification/revisionstatus/DifferentialRevisionStatusFieldSpecification.php
@@ -35,6 +35,9 @@ final class DifferentialRevisionStatusFieldSpecification
     $info = null;
     $local_vcs = $diff->getSourceControlSystem();
     $backing_vcs = $diff->getBackingVersionControlSystem();
+    if (!$backing_vcs) {
+      $backing_vcs = $local_vcs;
+    }
 
     if ($status == ArcanistDifferentialRevisionStatus::ACCEPTED) {
       if ($local_vcs == $backing_vcs) {
diff --git a/src/applications/differential/storage/diff/DifferentialDiff.php b/src/applications/differential/storage/diff/DifferentialDiff.php
index 6affe5bf98..ac27cb2d19 100644
--- a/src/applications/differential/storage/diff/DifferentialDiff.php
+++ b/src/applications/differential/storage/diff/DifferentialDiff.php
@@ -91,6 +91,9 @@ final class DifferentialDiff extends DifferentialDAO {
       return null;
     }
     $repository = $arcanist_project->loadRepository();
+    if (!$repository) {
+      return null;
+    }
     return $repository->getVersionControlSystem();
   }