diff --git a/drivers/network/ndis/ndis/stubs.c b/drivers/network/ndis/ndis/stubs.c
index a22dc167c3d..907dd402d0b 100644
--- a/drivers/network/ndis/ndis/stubs.c
+++ b/drivers/network/ndis/ndis/stubs.c
@@ -331,10 +331,12 @@ cleanup:
     ExFreePool ( FullFileName.Buffer );
     FullFileName.Buffer = NULL;
   }
-  if ( !NT_SUCCESS(*Status) && FileHandleObject != NULL )
+  if ( !NT_SUCCESS(*Status) )
   {
-    ExFreePool ( FileHandleObject );
-    FileHandleObject = NULL;
+    if( FileHandleObject ) {
+	ExFreePool ( FileHandleObject );
+	FileHandleObject = NULL;
+    }
     *FileHandle = NULL;
   }
   else