diff --git a/src/Spectre.Console/Cli/CommandApp.cs b/src/Spectre.Console/Cli/CommandApp.cs
index ce52a0e..e0d8f11 100644
--- a/src/Spectre.Console/Cli/CommandApp.cs
+++ b/src/Spectre.Console/Cli/CommandApp.cs
@@ -90,13 +90,6 @@ namespace Spectre.Console.Cli
             }
             catch (Exception ex)
             {
-                // Render the exception.
-                var pretty = GetRenderableErrorMessage(ex);
-                if (pretty != null)
-                {
-                    _configurator.Settings.Console.SafeRender(pretty);
-                }
-
                 // Should we always propagate when debugging?
                 if (Debugger.IsAttached
                     && ex is CommandAppException appException
@@ -110,6 +103,13 @@ namespace Spectre.Console.Cli
                     throw;
                 }
 
+                // Render the exception.
+                var pretty = GetRenderableErrorMessage(ex);
+                if (pretty != null)
+                {
+                    _configurator.Settings.Console.SafeRender(pretty);
+                }
+
                 return -1;
             }
         }