2 files changed, 6 insertions, 1 deletions
diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp
index e84b7716522..e890be9a144 100644
--- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp
+++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp
@@ -20,11 +20,15 @@
 
 bool CharacterDatabaseConnection::Open(const std::string& infoString)
 {
+    if (!MySQLConnection::Open(infoString))
+        return false;
+
+    m_stmts.resize(MAX_CHARACTERDATABASE_STATEMENTS);
     /*
         ##################################
         LOAD YOUR PREPARED STATEMENTS HERE
         ##################################
     */
 
-    return MySQLConnection::Open(infoString);
+    return true;
 }
diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp
index 3eb8cb3d032..64b2cea5d4b 100644
--- a/src/server/shared/Database/MySQLConnection.cpp
+++ b/src/server/shared/Database/MySQLConnection.cpp
@@ -310,6 +310,7 @@ void MySQLConnection::CommitTransaction()
 
 MySQLPreparedStatement* MySQLConnection::GetPreparedStatement(uint32 index)
 {
+    ASSERT(index < m_stmts.size());
     return m_stmts[index];
 }