diff --git a/src/aphront/configuration/AphrontApplicationConfiguration.php b/src/aphront/configuration/AphrontApplicationConfiguration.php
index 939102e5ca..c39dd2033a 100644
--- a/src/aphront/configuration/AphrontApplicationConfiguration.php
+++ b/src/aphront/configuration/AphrontApplicationConfiguration.php
@@ -81,9 +81,7 @@ abstract class AphrontApplicationConfiguration extends Phobject {
     try {
       PhabricatorEnv::initializeWebEnvironment();
       $database_exception = null;
-    } catch (AphrontInvalidCredentialsQueryException $ex) {
-      $database_exception = $ex;
-    } catch (AphrontConnectionQueryException $ex) {
+    } catch (PhabricatorClusterStrandedException $ex) {
       $database_exception = $ex;
     }
 
diff --git a/src/applications/config/issue/PhabricatorSetupIssue.php b/src/applications/config/issue/PhabricatorSetupIssue.php
index a3d024a728..a2e9532ede 100644
--- a/src/applications/config/issue/PhabricatorSetupIssue.php
+++ b/src/applications/config/issue/PhabricatorSetupIssue.php
@@ -22,7 +22,7 @@ final class PhabricatorSetupIssue extends Phobject {
   private $links;
 
   public static function newDatabaseConnectionIssue(
-    AphrontQueryException $ex,
+    Exception $ex,
     $is_fatal) {
 
     $message = pht(