diff --git a/headers/private/shared/AutoDeleter.h b/headers/private/shared/AutoDeleter.h
index 182501738b..2e7762ed19 100644
--- a/headers/private/shared/AutoDeleter.h
+++ b/headers/private/shared/AutoDeleter.h
@@ -134,7 +134,7 @@ struct CObjectDelete
 {
 	inline void operator()(Type *object)
 	{
-		if (fDestructor != NULL)
+		if (fDestructor != NULL && object != NULL)
 			fDestructor(object);
 	}
 
@@ -175,7 +175,7 @@ struct MethodDelete
 {
 	inline void operator()(Type *object)
 	{
-		if (fDestructor)
+		if (fDestructor && object != NULL)
 			(object->*fDestructor)();
 	}