diff --git a/src/box/sql.c b/src/box/sql.c
index c3418008c672e8676b725d906b7e881a8abba684..7b41c992687dffe8cce64a968c616727bae65dbf 100644
--- a/src/box/sql.c
+++ b/src/box/sql.c
@@ -90,9 +90,12 @@ sql_load_schema()
 	if (stat->def->field_count == 0)
 		return;
 	db->init.busy = 1;
-	sql_analysis_load(db);
-	if (db->errCode != SQLITE_OK)
+	if (sql_analysis_load(db) != SQLITE_OK) {
+		if(!diag_is_empty(&fiber()->diag)) {
+			diag_log();
+		}
 		panic("failed to initialize SQL subsystem");
+	}
 	db->init.busy = 0;
 }
 
diff --git a/src/box/sql/analyze.c b/src/box/sql/analyze.c
index e786c90192127bf056e003c42bcd09453010b78a..3f492800cb21babab9ae1cad8b419d7745b686ef 100644
--- a/src/box/sql/analyze.c
+++ b/src/box/sql/analyze.c
@@ -1682,7 +1682,9 @@ stat_copy(struct index_stat *dest, const struct index_stat *src)
 int
 sql_analysis_load(struct sqlite3 *db)
 {
-	uint32_t index_count = box_index_len(BOX_SQL_STAT1_ID, 0);
+	ssize_t index_count = box_index_len(BOX_SQL_STAT1_ID, 0);
+	if (index_count < 0)
+		return SQL_TARANTOOL_ERROR;
 	if (box_txn_begin() != 0)
 		goto fail;
 	size_t stats_size = index_count * sizeof(struct index_stat);