diff --git a/Patcher/PatchClient/PatchClient.csproj b/Patcher/PatchClient/PatchClient.csproj
index 373578d..4d35652 100644
--- a/Patcher/PatchClient/PatchClient.csproj
+++ b/Patcher/PatchClient/PatchClient.csproj
@@ -4,8 +4,8 @@
     <TargetFramework>net8.0</TargetFramework>
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>2.15.3</AssemblyVersion>
-    <FileVersion>2.15.3</FileVersion>
+    <AssemblyVersion>2.15.4</AssemblyVersion>
+    <FileVersion>2.15.4</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <AvaloniaResource Include="Assets\**" />
diff --git a/Patcher/PatchGenerator/PatchGenerator.csproj b/Patcher/PatchGenerator/PatchGenerator.csproj
index febd49a..97411e8 100644
--- a/Patcher/PatchGenerator/PatchGenerator.csproj
+++ b/Patcher/PatchGenerator/PatchGenerator.csproj
@@ -4,8 +4,8 @@
     <TargetFramework>net8.0</TargetFramework>
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>2.15.3</AssemblyVersion>
-    <FileVersion>2.15.3</FileVersion>
+    <AssemblyVersion>2.15.4</AssemblyVersion>
+    <FileVersion>2.15.4</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -42,8 +42,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\..\..\..\..\Downloads\PatchClient.exe">
-      <Link>Resources\PatchClient.exe</Link>
-    </EmbeddedResource>
+    <EmbeddedResource Include="Resources\PatchClient.exe" />
   </ItemGroup>
 </Project>
diff --git a/Patcher/PatchGenerator/Resources/PatchClient.exe b/Patcher/PatchGenerator/Resources/PatchClient.exe
index e69de29..13e5bdd 100644
Binary files a/Patcher/PatchGenerator/Resources/PatchClient.exe and b/Patcher/PatchGenerator/Resources/PatchClient.exe differ
diff --git a/Patcher/PatcherUtils/PatchHelper.cs b/Patcher/PatcherUtils/PatchHelper.cs
index bdca657..fbb4422 100644
--- a/Patcher/PatcherUtils/PatchHelper.cs
+++ b/Patcher/PatcherUtils/PatchHelper.cs
@@ -483,10 +483,10 @@ namespace PatcherUtils
 
                                 if (sourceFile == null)
                                 {
-                                    patchingTokenSource.Cancel();
                                     errorsQueue.Enqueue(new PatchMessage(
                                         $"Failed to find matching source file for '{deltaFile.FullName}'",
                                         PatcherExitCode.MissingFile));
+                                    patchingTokenSource.Cancel();
                                     return;
                                 }
 
@@ -495,8 +495,8 @@ namespace PatcherUtils
 
                                 if (!result.Item1)
                                 {
-                                    patchingTokenSource.Cancel();
                                     errorsQueue.Enqueue(new PatchMessage(result.Item2, PatcherExitCode.PatchFailed));
+                                    patchingTokenSource.Cancel();
                                     return;
                                 }
 
@@ -520,9 +520,9 @@ namespace PatcherUtils
                                 }
                                 catch (Exception ex)
                                 {
-                                    patchingTokenSource.Cancel();
                                     PatchLogger.LogException(ex);
                                     errorsQueue.Enqueue(new PatchMessage(ex.Message, PatcherExitCode.PatchFailed));
+                                    patchingTokenSource.Cancel();
                                     return;
                                 }
 
@@ -545,9 +545,9 @@ namespace PatcherUtils
                                 }
                                 catch (Exception ex)
                                 {
-                                    patchingTokenSource.Cancel();
                                     PatchLogger.LogException(ex);
                                     errorsQueue.Enqueue(new PatchMessage(ex.Message, PatcherExitCode.PatchFailed));
+                                    patchingTokenSource.Cancel();
                                     return;
                                 }
 
@@ -573,12 +573,23 @@ namespace PatcherUtils
             if (errorsQueue.Count > 0)
             {
                 PatchLogger.LogError($"Error queue entry count: {errorsQueue.Count}");
-                if (!errorsQueue.TryDequeue(out PatchMessage error))
+                PatchLogger.LogError("Dequeuing errors");
+                
+                PatchMessage error = null;
+                
+                for (int i = 0; i < errorsQueue.Count; i++)
                 {
-                    return new PatchMessage("Errors occurred during patching, but we couldn't dequeue them :(\n\nThere may be more information in the log", PatcherExitCode.PatchFailed);
+                    if (!errorsQueue.TryDequeue(out error))
+                    {
+                        return new PatchMessage(
+                            "Errors occurred during patching, but we couldn't dequeue them :(\n\nThere may be more information in the log",
+                            PatcherExitCode.PatchFailed);
+                    }
+                    
+                    PatchLogger.LogError(error.Message);
                 }
 
-                return error;
+                return error ?? new PatchMessage("Something went wrong :(", PatcherExitCode.PatchFailed);
             }
 
             PatchLogger.LogInfo("::: Patching Complete :::");