diff --git a/compiled_starters/zig/src/main.zig b/compiled_starters/zig/src/main.zig
index e5d80df..29f0041 100755
--- a/compiled_starters/zig/src/main.zig
+++ b/compiled_starters/zig/src/main.zig
@@ -1,4 +1,7 @@
 const std = @import("std");
+var stdout_buffer: [1024]u8 = undefined;
+var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);
+const stdout = &stdout_writer.interface;
 
 pub fn main() !void {
     var gpa = std.heap.GeneralPurposeAllocator(.{}){};
@@ -8,14 +11,9 @@ pub fn main() !void {
     const args = try std.process.argsAlloc(allocator);
     defer std.process.argsFree(allocator, args);
 
-    var stdout_buffer: [1024]u8 = undefined;
-    var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);
-    const stdout = &stdout_writer.interface;
-
     if (args.len < 3) {
-        try stdout.print("Usage: {s} <database_file_path> <command>\n", .{args[0]});
-        try stdout.flush();
-        return;
+        std.debug.print("Usage: {s} <database_file_path> <command>\n", .{args[0]});
+        std.process.exit(1);
     }
 
     const database_file_path: []const u8 = args[1];
diff --git a/solutions/zig/01-dr6/code/src/main.zig b/solutions/zig/01-dr6/code/src/main.zig
index 26d9aee..8154bf7 100755
--- a/solutions/zig/01-dr6/code/src/main.zig
+++ b/solutions/zig/01-dr6/code/src/main.zig
@@ -1,4 +1,7 @@
 const std = @import("std");
+var stdout_buffer: [1024]u8 = undefined;
+var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);
+const stdout = &stdout_writer.interface;
 
 pub fn main() !void {
     var gpa = std.heap.GeneralPurposeAllocator(.{}){};
@@ -8,14 +11,9 @@ pub fn main() !void {
     const args = try std.process.argsAlloc(allocator);
     defer std.process.argsFree(allocator, args);
 
-    var stdout_buffer: [1024]u8 = undefined;
-    var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);
-    const stdout = &stdout_writer.interface;
-
     if (args.len < 3) {
-        try stdout.print("Usage: {s} <database_file_path> <command>\n", .{args[0]});
-        try stdout.flush();
-        return;
+        std.debug.print("Usage: {s} <database_file_path> <command>\n", .{args[0]});
+        std.process.exit(1);
     }
 
     const database_file_path: []const u8 = args[1];
diff --git a/solutions/zig/01-dr6/diff/src/main.zig.diff b/solutions/zig/01-dr6/diff/src/main.zig.diff
index c05a28a..da3a8fe 100644
--- a/solutions/zig/01-dr6/diff/src/main.zig.diff
+++ b/solutions/zig/01-dr6/diff/src/main.zig.diff
@@ -1,4 +1,9 @@
-@@ -3,37 +3,33 @@
+@@ -1,37 +1,33 @@
+ const std = @import("std");
+ var stdout_buffer: [1024]u8 = undefined;
+ var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);
+ const stdout = &stdout_writer.interface;
+
  pub fn main() !void {
      var gpa = std.heap.GeneralPurposeAllocator(.{}){};
      defer _ = gpa.deinit();
@@ -7,14 +12,9 @@
      const args = try std.process.argsAlloc(allocator);
      defer std.process.argsFree(allocator, args);
 
-     var stdout_buffer: [1024]u8 = undefined;
-     var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);
-     const stdout = &stdout_writer.interface;
-
      if (args.len < 3) {
-         try stdout.print("Usage: {s} <database_file_path> <command>\n", .{args[0]});
-         try stdout.flush();
-         return;
+         std.debug.print("Usage: {s} <database_file_path> <command>\n", .{args[0]});
+         std.process.exit(1);
      }
 
      const database_file_path: []const u8 = args[1];
diff --git a/starter_templates/zig/code/src/main.zig b/starter_templates/zig/code/src/main.zig
index e5d80df..29f0041 100755
--- a/starter_templates/zig/code/src/main.zig
+++ b/starter_templates/zig/code/src/main.zig
@@ -1,4 +1,7 @@
 const std = @import("std");
+var stdout_buffer: [1024]u8 = undefined;
+var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);
+const stdout = &stdout_writer.interface;
 
 pub fn main() !void {
     var gpa = std.heap.GeneralPurposeAllocator(.{}){};
@@ -8,14 +11,9 @@ pub fn main() !void {
     const args = try std.process.argsAlloc(allocator);
     defer std.process.argsFree(allocator, args);
 
-    var stdout_buffer: [1024]u8 = undefined;
-    var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);
-    const stdout = &stdout_writer.interface;
-
     if (args.len < 3) {
-        try stdout.print("Usage: {s} <database_file_path> <command>\n", .{args[0]});
-        try stdout.flush();
-        return;
+        std.debug.print("Usage: {s} <database_file_path> <command>\n", .{args[0]});
+        std.process.exit(1);
     }
 
     const database_file_path: []const u8 = args[1];