diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index e5985be03..3a98d84e9 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -3504,14 +3504,14 @@ void SpellMgr::LoadSpellScriptTarget()
             if (!spellInfo)
                 continue;
 
-            SpellEffectEntry const* spellEffect = spellInfo->GetSpellEffect(SpellEffectIndex(i));
-            if(!spellEffect)
-                continue;
-
             for (int j = 0; j < MAX_EFFECT_INDEX; ++j)
             {
-                if (spellEffect && (spellEffect->EffectImplicitTargetA == TARGET_SCRIPT ||
-                                    (spellEffect->EffectImplicitTargetA != TARGET_SELF && spellEffect->EffectImplicitTargetB == TARGET_SCRIPT)))
+                SpellEffectEntry const* spellEffect = spellInfo->GetSpellEffect(SpellEffectIndex(j));
+                if (!spellEffect)
+                    continue;
+
+                if (spellEffect->EffectImplicitTargetA == TARGET_SCRIPT ||
+                    spellEffect->EffectImplicitTargetA != TARGET_SELF && spellEffect->EffectImplicitTargetB == TARGET_SCRIPT)
                 {
                     SQLMultiStorage::SQLMSIteratorBounds<SpellTargetEntry> bounds = sSpellScriptTargetStorage.getBounds<SpellTargetEntry>(i);
                     if (bounds.first == bounds.second)
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index a74f1d995..d103246f8 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 "12650"
+ #define REVISION_NR "12651"
 #endif // __REVISION_NR_H__