diff --git a/xtldr/config.c b/xtldr/config.c
index b946700..763a03d 100644
--- a/xtldr/config.c
+++ b/xtldr/config.c
@@ -132,7 +132,7 @@ BlpLoadConfiguration()
     if(Status != STATUS_EFI_SUCCESS)
     {
         /* Failed to load configuration */
-        BlDebugPrint(L"Failed to load configuration file (FS0:/EFI/BOOT/XTLDR.INI)\n");
+        BlDebugPrint(L"Failed to load FS0:/EFI/BOOT/XTLDR.INI configuration file (Status Code: 0x%lx)\n", Status);
         return Status;
     }
 
@@ -141,7 +141,7 @@ BlpLoadConfiguration()
     if(Status != STATUS_EFI_SUCCESS)
     {
         /* Failed to parse configuration */
-        BlDebugPrint(L"Failed to parse configuration file (FS0:/EFI/BOOT/XTLDR.INI)\n");
+        BlDebugPrint(L"Failed to parse FS0:/EFI/BOOT/XTLDR.INI configuration file (Status Code: 0x%lx)\n", Status);
         return Status;
     }
 
diff --git a/xtldr/volume.c b/xtldr/volume.c
index 32cfed7..fdfca08 100644
--- a/xtldr/volume.c
+++ b/xtldr/volume.c
@@ -642,7 +642,7 @@ BlpDiscoverEfiBlockDevices(OUT PLIST_ENTRY BlockDevices)
         if(Io->Media && Io->Media->BlockSize == 1 && Io->Media->MediaId == 0x69505845U)
         {
             /* Skip stub as it is non-functional */
-            BlDebugPrint(L"WARNING: iPXE stub block I/O protocol");
+            BlDebugPrint(L"WARNING: Skipping iPXE stub block I/O protocol");
             continue;
         }
 
diff --git a/xtldr/xtldr.c b/xtldr/xtldr.c
index dbcf185..6cf574a 100644
--- a/xtldr/xtldr.c
+++ b/xtldr/xtldr.c
@@ -195,7 +195,7 @@ BlInvokeBootProtocol(IN PLIST_ENTRY OptionsList)
             if(Status != STATUS_EFI_SUCCESS)
             {
                 /* Failed to allocate memory, print error message and return status code */
-                BlDebugPrint(L"ERROR: Memory allocation failure (Status Code: 0x%lx)\n");
+                BlDebugPrint(L"ERROR: Memory allocation failure (Status Code: 0x%lx)\n", Status);
                 return STATUS_EFI_OUT_OF_RESOURCES;
             }
 
@@ -248,7 +248,7 @@ BlInvokeBootProtocol(IN PLIST_ENTRY OptionsList)
     if(Status != STATUS_EFI_SUCCESS)
     {
         /* Failed to load modules, print error message and return status code */
-        BlDebugPrint(L"ERROR: Failed to load XTLDR modules\n");
+        BlDebugPrint(L"ERROR: Failed to load XTLDR modules (Status Code: 0x%lx)\n", Status);
         return STATUS_EFI_NOT_READY;
     }
 
@@ -325,7 +325,7 @@ BlStartXtLoader(IN EFI_HANDLE ImageHandle,
     if(Status != STATUS_EFI_SUCCESS)
     {
         /* Failed to load/parse config file */
-        BlDisplayErrorDialog(L"XTLDR", L"Failed to load and parse configuration file.");
+        BlDisplayErrorDialog(L"XTLDR", L"Failed to load and parse configuration file ");
     }
 
     /* Reinitialize debug console if it was not initialized earlier */
@@ -344,7 +344,7 @@ BlStartXtLoader(IN EFI_HANDLE ImageHandle,
     if(Status != STATUS_EFI_SUCCESS)
     {
         /* Failed to disable the timer, print message */
-        BlDebugPrint(L"WARNING: Failed to disable watchdog timer\n");
+        BlDebugPrint(L"WARNING: Failed to disable watchdog timer (Status Code: 0x%lx)\n", Status);
     }
 
     /* Register loader protocol */
@@ -352,7 +352,7 @@ BlStartXtLoader(IN EFI_HANDLE ImageHandle,
     if(Status != STATUS_EFI_SUCCESS)
     {
         /* Failed to register loader protocol */
-        BlDebugPrint(L"ERROR: Failed to register XTLDR boot protocol\n");
+        BlDebugPrint(L"ERROR: Failed to register XTLDR boot protocol (Status Code: 0x%lx)\n", Status);
         return Status;
     }
 
@@ -370,7 +370,7 @@ BlStartXtLoader(IN EFI_HANDLE ImageHandle,
     if(Status != STATUS_EFI_SUCCESS)
     {
         /* Failed to enumerate block devices */
-        BlDebugPrint(L"ERROR: Failed to discover and enumerate block devices\n");
+        BlDebugPrint(L"ERROR: Failed to discover and enumerate block devices (Status Code: 0x%lx)\n", Status);
         return Status;
     }