diff --git a/src/Driver/DriveFilter.c b/src/Driver/DriveFilter.c
index c153a1ad..eba7c40c 100644
--- a/src/Driver/DriveFilter.c
+++ b/src/Driver/DriveFilter.c
@@ -1545,9 +1545,11 @@ static VOID SetupThreadProc (PVOID threadArg)
 		{
 			status = SaveDriveVolumeHeader (Extension);
 			ASSERT (NT_SUCCESS (status));
-
-			headerUpdateRequired = FALSE;
-			bytesWrittenSinceHeaderUpdate = 0;
+			if (NT_SUCCESS (status))
+			{
+				headerUpdateRequired = FALSE;
+				bytesWrittenSinceHeaderUpdate = 0;
+			}
 		}
 	}