diff --git a/src/game/Spell.h b/src/game/Spell.h
index 9ba620b66b..1bdb715417 100644
--- a/src/game/Spell.h
+++ b/src/game/Spell.h
@@ -618,7 +618,7 @@ namespace Trinity
                     }break;
                     case SPELL_TARGETS_ENTRY:
                     {
-                        if(itr->getSource()->GetTypeId()!=TYPEID_UNIT || itr->getSource()->GetEntry()!= i_entry)
+                        if(itr->getSource()->GetEntry()!= i_entry)
                             continue;
                     }break;
                     default: continue;
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 8d17d94ec8..4091efd200 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -1685,12 +1685,13 @@ void SpellMgr::LoadSpellScriptTarget()
             }
             default:
             {
-                if( targetEntry==0 )
+                //players
+                /*if( targetEntry==0 )
                 {
                     sLog.outErrorDb("Table `spell_script_target`: target entry == 0 for not GO target type (%u).",type);
                     continue;
-                }
-                if(!sCreatureStorage.LookupEntry<CreatureInfo>(targetEntry))
+                }*/
+                if(targetEntry && !sCreatureStorage.LookupEntry<CreatureInfo>(targetEntry))
                 {
                     sLog.outErrorDb("Table `spell_script_target`: creature template entry %u does not exist.",targetEntry);
                     continue;