diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index cc2655ceaf2e..2d774f5fdb6d 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.ts
@@ -77,7 +77,9 @@ export default async function (options: { cliArgs: string[] }) {
     } else if (typeof err === 'number') {
       // Log nothing.
     } else {
-      logger.fatal('An unexpected error occurred: ' + JSON.stringify(err));
+      logger.fatal(
+        `An unexpected error occurred: ${'toString' in err ? err.toString() : JSON.stringify(err)}`,
+      );
     }
 
     return 1;
diff --git a/packages/angular/cli/src/command-builder/schematics-command-module.ts b/packages/angular/cli/src/command-builder/schematics-command-module.ts
index acd79a35c737..54afe0bf3181 100644
--- a/packages/angular/cli/src/command-builder/schematics-command-module.ts
+++ b/packages/angular/cli/src/command-builder/schematics-command-module.ts
@@ -321,11 +321,11 @@ export abstract class SchematicsCommandModule
       if (err instanceof UnsuccessfulWorkflowExecution) {
         // "See above" because we already printed the error.
         logger.fatal('The Schematic workflow failed. See above.');
-
-        return 1;
       } else {
-        throw err;
+        logger.fatal(err.message);
       }
+
+      return 1;
     } finally {
       unsubscribe();
     }