diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index b35f722e9..310650580 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -2193,7 +2193,7 @@ void SpellMgr::LoadSpellScriptTarget()
             continue;
         }
 
-        if ( type >= MAX_SPELL_TARGET_TYPE )
+        if (type >= MAX_SPELL_TARGET_TYPE)
         {
             sLog.outErrorDb("Table `spell_script_target`: target type %u for TargetEntry %u is incorrect.",type,targetEntry);
             continue;
@@ -2212,6 +2212,13 @@ void SpellMgr::LoadSpellScriptTarget()
                     ok = false;
                     break;
                 }
+
+                if (type != SPELL_TARGET_TYPE_GAMEOBJECT)
+                {
+                    sLog.outErrorDb("Table `spell_script_target`: spellId %u has target type TARGET_FOCUS_OR_SCRIPTED_GAMEOBJECT but target in table is creature (must be gameobject).", spellId);
+                    ok = false;
+                    break;
+                }
             }
         }
         if (!ok)
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 9113686f3..d4223664b 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 "8637"
+ #define REVISION_NR "8638"
 #endif // __REVISION_NR_H__