diff --git a/Library/OcDebugLogLib/OcLog.c b/Library/OcDebugLogLib/OcDebugLogLib: Workaround stall in EDK II return assertions
similarity index 98%
rename from Library/OcDebugLogLib/OcLog.c
rename to Library/OcDebugLogLib/OcDebugLogLib: Workaround stall in EDK II return assertions
index 52e98876..d8c7108a 100755
--- a/Library/OcDebugLogLib/OcLog.c
+++ b/Library/OcDebugLogLib/OcDebugLogLib: Workaround stall in EDK II return assertions	
@@ -301,7 +301,9 @@ OcLogAddEntry  (
     }
   }
 
-  if ((ErrorLevel & OcLog->HaltLevel) != 0) {
+  if ((ErrorLevel & OcLog->HaltLevel) != 0
+    && AsciiStrnCmp (FormatString, "\nASSERT_RETURN_ERROR", L_STR_LEN ("\nASSERT_RETURN_ERROR")) != 0
+    && AsciiStrnCmp (FormatString, "\nASSERT_EFI_ERROR", L_STR_LEN ("\nASSERT_EFI_ERROR")) != 0) {
     gST->ConOut->OutputString (gST->ConOut, L"Halting on critical error\r\n");
     gBS->Stall (SECONDS_TO_MICROSECONDS (1));
     CpuDeadLoop ();