Core/DataStores: Fixed loading db2 strings

Closes #24916

1 files changed, 4 insertions, 3 deletions

diff --git a/src/server/shared/DataStores/DB2Store.cpp b/src/server/shared/DataStores/DB2Store.cpp
index 0c99462ec5d..f7ec9ab2473 100644
--- a/src/server/shared/DataStores/DB2Store.cpp
+++ b/src/server/shared/DataStores/DB2Store.cpp
@@ -98,11 +98,12 @@ bool DB2StorageBase::Load(std::string const& path, LocaleConstant locale, char**
 
     // load raw non-string data
     _dataTable = db2.AutoProduceData(_indexTableSize, indexTable, _stringPool);
+    if (!_dataTable)
+        return false;
 
     // load strings from db2 data
-    if (!_stringPool.empty())
-        if (char* stringBlock = db2.AutoProduceStrings(indexTable, _indexTableSize, locale))
-            _stringPool.push_back(stringBlock);
+    if (char* stringBlock = db2.AutoProduceStrings(indexTable, _indexTableSize, locale))
+        _stringPool.push_back(stringBlock);
 
     db2.AutoProduceRecordCopies(_indexTableSize, indexTable, _dataTable);