diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 616970153..56174f1a9 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -4730,7 +4730,7 @@ struct SQLWorldLoader : public SQLStorageLoaderBase<SQLWorldLoader>
 void ObjectMgr::LoadWorldTemplate()
 {
     SQLWorldLoader loader;
-    loader.Load(sWorldTemplate);
+    loader.Load(sWorldTemplate, false);
 
     for(uint32 i = 0; i < sWorldTemplate.MaxEntry; i++)
     {
diff --git a/src/shared/Database/SQLStorage.h b/src/shared/Database/SQLStorage.h
index 34110287d..3abf249a7 100644
--- a/src/shared/Database/SQLStorage.h
+++ b/src/shared/Database/SQLStorage.h
@@ -94,7 +94,7 @@ template <class T>
 struct SQLStorageLoaderBase
 {
     public:
-        void Load(SQLStorage &storage);
+        void Load(SQLStorage &storage, bool error_at_empty = true);
 
         template<class S, class D>
             void convert(uint32 field_pos, S src, D &dst);
diff --git a/src/shared/Database/SQLStorageImpl.h b/src/shared/Database/SQLStorageImpl.h
index 25f112d06..cad684d19 100644
--- a/src/shared/Database/SQLStorageImpl.h
+++ b/src/shared/Database/SQLStorageImpl.h
@@ -121,7 +121,7 @@ void SQLStorageLoaderBase<T>::storeValue(char const* value, SQLStorage &store, c
 }
 
 template<class T>
-void SQLStorageLoaderBase<T>::Load(SQLStorage &store)
+void SQLStorageLoaderBase<T>::Load(SQLStorage &store, bool error_at_empty /*= true*/)
 {
     uint32 maxi;
     Field *fields;
@@ -150,7 +150,11 @@ void SQLStorageLoaderBase<T>::Load(SQLStorage &store)
 
     if(!result)
     {
-        sLog.outError("%s table is empty!\n", store.table);
+        if (error_at_empty)
+            sLog.outError("%s table is empty!\n", store.table);
+        else
+            sLog.outString("%s table is empty!\n", store.table);
+
         store.RecordCount = 0;
         return;
     }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index bf0386717..3bced2b7c 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11117"
+ #define REVISION_NR "11118"
 #endif // __REVISION_NR_H__