From 2ef6915a4ce48ee049e0eda23365eba2d7a20ed5 Mon Sep 17 00:00:00 2001
From: Charles Dang <exodia339@gmail.com>
Date: Mon, 22 May 2017 01:30:36 +1100
Subject: [PATCH] Re-add validation check

---
 src/game_events/manager.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/game_events/manager.cpp b/src/game_events/manager.cpp
index 0e5773e9278a1..59e6aa575e0eb 100644
--- a/src/game_events/manager.cpp
+++ b/src/game_events/manager.cpp
@@ -152,7 +152,9 @@ manager::iteration& manager::iteration::operator++()
 static handler_ptr lock_ptr(const handler_list& list, handler_list::iterator iter)
 {
 	if(iter != list.end()) {
-		return iter->lock();
+		if(handler_ptr ptr = iter->lock()) {
+			return ptr;
+		}
 	}
 
 	return nullptr;