diff --git a/src/WINNT/afsrdr/kernel/fs/AFSGeneric.cpp b/src/WINNT/afsrdr/kernel/fs/AFSGeneric.cpp
index 9150c66708..d296e8b55d 100644
--- a/src/WINNT/afsrdr/kernel/fs/AFSGeneric.cpp
+++ b/src/WINNT/afsrdr/kernel/fs/AFSGeneric.cpp
@@ -1317,32 +1317,23 @@ AFSExAllocatePoolWithTag( IN POOL_TYPE  PoolType,
     if( pBuffer == NULL)
     {
 
-        if( BooleanFlagOn( AFSDebugFlags, AFS_DBG_BUGCHECK_EXCEPTION))
-        {
+        AFSDbgLogMsg( 0,
+                      0,
+                      "AFSExAllocatePoolWithTag failure Type %08lX Size %08lX Tag %08lX %08lX\n",
+                      PoolType,
+                      NumberOfBytes,
+                      Tag,
+                      PsGetCurrentThread());
 
-            KeBugCheck( (ULONG)-2);
-        }
-        else
-        {
+        switch ( Tag ) {
 
-            AFSDbgLogMsg( 0,
-                          0,
-                          "AFSExAllocatePoolWithTag failure Type %08lX Size %08lX Tag %08lX %08lX\n",
-                          PoolType,
-                          NumberOfBytes,
-                          Tag,
-                          PsGetCurrentThread());
+        case AFS_GENERIC_MEMORY_21_TAG:
+        case AFS_GENERIC_MEMORY_22_TAG:
+            // AFSDumpTraceFiles -- do nothing;
+            break;
 
-            switch ( Tag ) {
-
-            case AFS_GENERIC_MEMORY_21_TAG:
-            case AFS_GENERIC_MEMORY_22_TAG:
-                // AFSDumpTraceFiles -- do nothing;
-                break;
-
-            default:
-                AFSBreakPoint();
-            }
+        default:
+            AFSBreakPoint();
         }
     }
 
diff --git a/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp b/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp
index f2b41c56b3..94a2795343 100644
--- a/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp
+++ b/src/WINNT/afsrdr/kernel/lib/AFSExtentsSupport.cpp
@@ -1014,8 +1014,6 @@ AFSProcessExtentsResult( IN AFSFcb *Fcb,
                 if (NULL  == pExtent)
                 {
 
-                    ASSERT( FALSE);
-
                     try_return (ntStatus = STATUS_INSUFFICIENT_RESOURCES );
                 }