diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index f3140cb93..d8f6259ca 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -1781,7 +1781,7 @@ void Spell::SetTargetMap(uint32 i,uint32 cur,UnitList& TagUnitMap)
         {
             // Check original caster is GO - set its coordinates as dst cast
             WorldObject *caster = NULL;
-            if (m_originalCasterGUID)
+            if (IS_GAMEOBJECT_GUID(m_originalCasterGUID))
                 caster = ObjectAccessor::GetGameObject(*m_caster, m_originalCasterGUID);
             if (!caster)
                 caster = m_caster;
@@ -5407,7 +5407,7 @@ bool Spell::CheckTarget( Unit* target, uint32 eff )
         default:                                            // normal case
             // Get GO cast coordinates if original caster -> GO
             WorldObject *caster = NULL;
-            if (m_originalCasterGUID)
+            if (IS_GAMEOBJECT_GUID(m_originalCasterGUID))
                 caster = ObjectAccessor::GetGameObject(*m_caster, m_originalCasterGUID);
             if (!caster)
                 caster = m_caster;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 212aec81b..b6b59dd08 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 "7680"
+ #define REVISION_NR "7681"
 #endif // __REVISION_NR_H__