diff --git a/storage/innobase/dict/dict0stats.cc b/storage/innobase/dict/dict0stats.cc
index b5291ccbd87f2b97fb63ce2286774037d6be85f8..e8dd976f8d237617480c02dfec9868c26f72ed6d 100644
--- a/storage/innobase/dict/dict0stats.cc
+++ b/storage/innobase/dict/dict0stats.cc
@@ -514,15 +514,17 @@ static bool dict_stats_persistent_storage_check(bool dict_already_locked)
 		dict_sys.unlock();
 	}
 
-	if (ret != DB_SUCCESS && ret != DB_STATS_DO_NOT_EXIST) {
-		ib::error() << errstr;
-		return(false);
-	} else if (ret == DB_STATS_DO_NOT_EXIST) {
+	switch (ret) {
+	case DB_SUCCESS:
+		return true;
+	default:
+		if (!opt_bootstrap) {
+			ib::error() << errstr;
+		}
+		/* fall through */
+	case DB_STATS_DO_NOT_EXIST:
 		return false;
 	}
-	/* else */
-
-	return(true);
 }
 
 /** Executes a given SQL statement using the InnoDB internal SQL parser.