diff --git a/src/game/Spell.h b/src/game/Spell.h
index 206f55778..e72705161 100644
--- a/src/game/Spell.h
+++ b/src/game/Spell.h
@@ -664,7 +664,7 @@ namespace MaNGOS
             : i_data(&data), i_spell(spell), i_push_type(type), i_radius(radius), i_TargetType(TargetType)
         {
             i_originalCaster = spell.GetCastingObject();
-            i_playerControled = i_originalCaster->IsControlledByPlayer();
+            i_playerControled = i_originalCaster  ? i_originalCaster->IsControlledByPlayer() : false;
         }
 
         template<class T> inline void Visit(GridRefManager<T>  &m)
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 70a615730..7156e2ff6 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 "9510"
+ #define REVISION_NR "9511"
 #endif // __REVISION_NR_H__