diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 4a60e7620..c72564862 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -4039,6 +4039,8 @@ void Spell::EffectTameCreature(uint32 /*i*/)
     finish();
 
     Pet* pet = m_caster->CreateTamedPetFrom(creatureTarget,m_spellInfo->Id);
+    if(!pet)                                                // in versy specific state like near world end/etc.
+        return;
 
     // kill original creature
     creatureTarget->setDeathState(JUST_DIED);
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index bdf63fc02..e07c9fa24 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 "7935"
+ #define REVISION_NR "7936"
 #endif // __REVISION_NR_H__