diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index de5669324..309c09875 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -9603,7 +9603,8 @@ void Unit::ClearInCombat()
     // Player's state will be cleared in Player::UpdateContestedPvP
     if (GetTypeId() != TYPEID_PLAYER)
     {
-        if (((Creature*)this)->GetCreatureInfo()->unit_flags & UNIT_FLAG_OOC_NOT_ATTACKABLE)
+        Creature* creature = (Creature*)this;
+        if (creature->GetCreatureInfo() && creature->GetCreatureInfo()->unit_flags & UNIT_FLAG_OOC_NOT_ATTACKABLE)
             SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
 
         clearUnitState(UNIT_STAT_ATTACK_PLAYER);
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 6a43c57a9..fcf402369 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 "8721"
+ #define REVISION_NR "8722"
 #endif // __REVISION_NR_H__