diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index a11395c9b..65604b3f1 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -9349,6 +9349,8 @@ bool Unit::SelectHostilTarget()
 
     assert(GetTypeId()== TYPEID_UNIT);
 
+    if (!this->isAlive())
+        return false;
     //This function only useful once AI has been initialized
     if (!((Creature*)this)->AI())
         return false;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 4ef3779b2..7f75b49b7 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 "7157"
+ #define REVISION_NR "7158"
 #endif // __REVISION_NR_H__