diff --git a/reactos/subsys/win32k/ntddraw/ddraw.c b/reactos/subsys/win32k/ntddraw/ddraw.c
index d8277441bb0..3a4f6e19f7b 100644
--- a/reactos/subsys/win32k/ntddraw/ddraw.c
+++ b/reactos/subsys/win32k/ntddraw/ddraw.c
@@ -19,16 +19,19 @@
 
 BOOL INTERNAL_CALL
 DD_Cleanup(PVOID ObjectBody)
-{
-    if (ObjectBody == NULL)
-        return FALSE;
-        
+{       
 	PDD_DIRECTDRAW pDirectDraw = (PDD_DIRECTDRAW) ObjectBody;
 	DPRINT1("DD_Cleanup\n");
 	
 	if (!pDirectDraw)
 		return FALSE;
-
+    
+    if (pDirectDraw->Global.dhpdev == NULL)
+        return FALSE;
+        
+    if (pDirectDraw->DrvDisableDirectDraw == NULL)
+        return FALSE;
+        
 	pDirectDraw->DrvDisableDirectDraw(pDirectDraw->Global.dhpdev);
 	return TRUE;
 }