diff --git a/src/applications/config/check/PhabricatorSetupCheck.php b/src/applications/config/check/PhabricatorSetupCheck.php
index 0d9101efe3..e0574b7636 100644
--- a/src/applications/config/check/PhabricatorSetupCheck.php
+++ b/src/applications/config/check/PhabricatorSetupCheck.php
@@ -82,12 +82,12 @@ abstract class PhabricatorSetupCheck extends Phobject {
       AphrontWriteGuard::allowDangerousUnguardedWrites(true);
     }
 
-    $caught = null;
     try {
       $db_cache = new PhabricatorKeyValueDatabaseCache();
       $db_cache->deleteKey('phabricator.setup.issue-keys');
     } catch (Exception $ex) {
-      $caught = $ex;
+      // If we hit an exception here, just ignore it. In particular, this can
+      // happen on initial startup before the databases are initialized.
     }
 
     if ($use_scope) {
@@ -95,10 +95,6 @@ abstract class PhabricatorSetupCheck extends Phobject {
     } else {
       AphrontWriteGuard::allowDangerousUnguardedWrites(false);
     }
-
-    if ($caught) {
-      throw $caught;
-    }
   }
 
   final public static function setOpenSetupIssueKeys(
diff --git a/src/applications/settings/editor/PhabricatorUserPreferencesEditor.php b/src/applications/settings/editor/PhabricatorUserPreferencesEditor.php
index c2ec0a7094..a927cc7475 100644
--- a/src/applications/settings/editor/PhabricatorUserPreferencesEditor.php
+++ b/src/applications/settings/editor/PhabricatorUserPreferencesEditor.php
@@ -159,7 +159,7 @@ final class PhabricatorUserPreferencesEditor
         $user_phid);
     } else {
       $cache = PhabricatorCaches::getMutableStructureCache();
-      $cache->deleteKey(PhabricatorUserPreferences::getGlobalCacheKey());
+      $cache->deleteKey(PhabricatorUser::getGlobalSettingsCacheKey());
 
       PhabricatorUserCache::clearCacheForAllUsers(
         PhabricatorUserPreferencesCacheType::KEY_PREFERENCES);