diff --git a/Src/GbxToolAPI.CLI/ToolConsole.cs b/Src/GbxToolAPI.CLI/ToolConsole.cs
index 416cc8d..36e7226 100644
--- a/Src/GbxToolAPI.CLI/ToolConsole.cs
+++ b/Src/GbxToolAPI.CLI/ToolConsole.cs
@@ -440,19 +440,26 @@ private static async Task RunToolInstanceAsync(T toolInstance, Dictionary<Proper
 
             var watch = Stopwatch.StartNew();
 
-            var output = produceMethod.Invoke(toolInstance, null);
+            try
+            {
+                var output = produceMethod.Invoke(toolInstance, null);
 
-            var name = output is null ? "[null]" : GetTypeName(output.GetType());
+                var name = output is null ? "[null]" : GetTypeName(output.GetType());
 
-            Console.WriteLine($"Produced {name}. ({watch.Elapsed.TotalMilliseconds}ms)");
+                Console.WriteLine($"Produced {name}. ({watch.Elapsed.TotalMilliseconds}ms)");
 
-            if (output is null)
+                if (output is null)
+                {
+                    continue;
+                }
+
+                var outputSaver = new OutputSaver(output, outputDir);
+                outputSaver.Save();
+            }
+            catch (TargetInvocationException tie)
             {
-                continue;
+                throw tie.InnerException ?? tie;
             }
-
-            var outputSaver = new OutputSaver(output, outputDir);
-            outputSaver.Save();
         }
     }