diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 0078ed535d..d927b162d3 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -17816,6 +17816,8 @@ inline void UpdateVisibilityOf_helper(std::set<uint64>& s64, GameObject* target)
 template<class T>
 void Player::UpdateVisibilityOf(T* target, UpdateData& data, std::set<WorldObject*>& visibleNow)
 {
+    if(!target)
+	return;
     if(HaveAtClient(target))
     {
         if(!target->isVisibleForInState(this,true))