diff --git a/reactos/drivers/fs/np/fsctrl.c b/reactos/drivers/fs/np/fsctrl.c
index 5dcacd46e6c..1f5ba900247 100644
--- a/reactos/drivers/fs/np/fsctrl.c
+++ b/reactos/drivers/fs/np/fsctrl.c
@@ -22,10 +22,11 @@ NpfsListeningCancelRoutine(IN PDEVICE_OBJECT DeviceObject,
 {
   PNPFS_WAITER_ENTRY Waiter;
 
-  DPRINT1("NpfsListeningCancelRoutine() called\n");
-
   Waiter = (PNPFS_WAITER_ENTRY)&Irp->Tail.Overlay.DriverContext;
 
+  DPRINT1("NpfsListeningCancelRoutine() called for <%wZ>\n",
+         &Waiter->Fcb->Pipe->PipeName);
+
   IoReleaseCancelSpinLock(Irp->CancelIrql);
 
 
diff --git a/reactos/drivers/fs/np/rw.c b/reactos/drivers/fs/np/rw.c
index 0676d42d345..e4f8cb28744 100644
--- a/reactos/drivers/fs/np/rw.c
+++ b/reactos/drivers/fs/np/rw.c
@@ -442,6 +442,7 @@ NpfsRead(IN PDEVICE_OBJECT DeviceObject,
 	      break;
 	   }
         }
+        ASSERT(IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL);
         if (Fcb->Pipe->ReadMode == FILE_PIPE_BYTE_STREAM_MODE)
         {
 	   DPRINT("Byte stream mode\n");