diff --git a/sql/mangos.sql b/sql/mangos.sql
index 18be4c83d..6a603bc4e 100644
--- a/sql/mangos.sql
+++ b/sql/mangos.sql
@@ -22,7 +22,7 @@
 DROP TABLE IF EXISTS `db_version`;
 CREATE TABLE `db_version` (
   `version` varchar(120) default NULL,
-  `required_2008_11_11_02_mangos_scripts` bit(1) default NULL
+  `required_2008_11_14_01_mangos_scripts` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
diff --git a/sql/updates/2008_11_14_01_mangos_scripts.sql b/sql/updates/2008_11_14_01_mangos_scripts.sql
new file mode 100644
index 000000000..ab51cf3d8
--- /dev/null
+++ b/sql/updates/2008_11_14_01_mangos_scripts.sql
@@ -0,0 +1,16 @@
+ALTER TABLE db_version CHANGE COLUMN required_2008_11_11_02_mangos_scripts required_2008_11_14_01_mangos_scripts bit;
+
+ALTER TABLE event_scripts
+  CHANGE COLUMN dataint dataint int(11) NOT NULL default '0' AFTER datalong2; 
+
+ALTER TABLE gameobject_scripts
+  CHANGE COLUMN dataint dataint int(11) NOT NULL default '0' AFTER datalong2; 
+
+ALTER TABLE quest_end_scripts
+  CHANGE COLUMN dataint dataint int(11) NOT NULL default '0' AFTER datalong2; 
+
+ALTER TABLE quest_start_scripts
+  CHANGE COLUMN dataint dataint int(11) NOT NULL default '0' AFTER datalong2; 
+
+ALTER TABLE spell_scripts
+  CHANGE COLUMN dataint dataint int(11) NOT NULL default '0' AFTER datalong2; 
diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am
index a7ba394f4..b743c6d15 100644
--- a/sql/updates/Makefile.am
+++ b/sql/updates/Makefile.am
@@ -132,6 +132,7 @@ pkgdata_DATA = \
 	2008_11_09_03_mangos_mangos_string.sql \
 	2008_11_11_01_mangos_db_script_string.sql \
 	2008_11_11_02_mangos_scripts.sql \
+	2008_11_14_01_mangos_scripts.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -246,4 +247,5 @@ EXTRA_DIST = \
 	2008_11_11_01_mangos_db_script_string.sql \
 	2008_11_11_02_mangos_scripts.sql \
 	2008_11_12_01_character_character_aura.sql \
+	2008_11_14_01_mangos_scripts.sql \
 	README
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 635077035..f49f0a136 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -3704,11 +3704,8 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
                     sLog.outErrorDb("Table `%s` has out of range text id (dataint = %i expected %u-%u) in SCRIPT_COMMAND_TALK for script id %u",tablename,tmp.dataint,MIN_DB_SCRIPT_STRING_ID,MAX_DB_SCRIPT_STRING_ID,tmp.id);
                     continue;
                 }
-                if(!objmgr.GetMangosStringLocale(tmp.dataint))
-                {
-                    sLog.outErrorDb("Table `%s` has not existed text id (dataint = %i) in SCRIPT_COMMAND_TALK for script id %u",tablename,tmp.dataint,tmp.id);
-                    continue;
-                }
+
+                // if(!objmgr.GetMangosStringLocale(tmp.dataint)) will checked after db_script_string loading
                 break;
             }
 
@@ -7207,10 +7204,11 @@ void ObjectMgr::CheckScripts(ScriptMapMap const& scripts,std::set<int32>& ids)
         {
             if(itrM->second.dataint)
             {
+                if(!GetMangosStringLocale (itrM->second.dataint))
+                    sLog.outErrorDb( "Table `db_script_string` has not existed string id  %u", *itrM);
+
                 if(ids.count(itrM->second.dataint))
                     ids.erase(itrM->second.dataint);
-                else
-                    sLog.outErrorDb( "Table `db_script_string` has not existed string id  %u", *itrM);
             }
         }
     }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index a6feab50f..264605f9f 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 "6823"
+ #define REVISION_NR "6824"
 #endif // __REVISION_NR_H__