diff --git a/core/object/object.h b/core/object/object.h
index f97691841fd..cb1495296dd 100644
--- a/core/object/object.h
+++ b/core/object/object.h
@@ -798,12 +798,12 @@ public:
 
 	template <class T>
 	static T *cast_to(Object *p_object) {
-		return dynamic_cast<T *>(p_object);
+		return p_object ? dynamic_cast<T *>(p_object) : nullptr;
 	}
 
 	template <class T>
 	static const T *cast_to(const Object *p_object) {
-		return dynamic_cast<const T *>(p_object);
+		return p_object ? dynamic_cast<const T *>(p_object) : nullptr;
 	}
 
 	enum {