diff --git a/lib/std/encoding/json.c3 b/lib/std/encoding/json.c3
index 648dc98fb..b5129808d 100644
--- a/lib/std/encoding/json.c3
+++ b/lib/std/encoding/json.c3
@@ -225,11 +225,12 @@ fn char! read_next(JsonContext* context) @local
 	char! c = context.stream.read_byte();
 	if (catch err = c)
 	{
-		case IoError.EOF:
+		if (err == IoError.EOF)
+		{
 			context.reached_end = true;
 			return '\0';
-		default:
-			return err?;
+		}
+		return err?;
 	}
 	if (c == 0)
 	{
diff --git a/lib/std/io/formatter.c3 b/lib/std/io/formatter.c3
index 6a51386be..052a0d9c9 100644
--- a/lib/std/io/formatter.c3
+++ b/lib/std/io/formatter.c3
@@ -340,13 +340,16 @@ macro usz! @wrap_bad(Formatter* f, #action)
 	usz! len = #action;
 	if (catch err = len)
 	{
-		case PrintFault.BUFFER_EXCEEDED:
-		case PrintFault.INTERNAL_BUFFER_EXCEEDED:
-			return f.first_err(err)?;
-		default:
-			err = f.first_err(PrintFault.INVALID_ARGUMENT);
-			f.out_substr("<INVALID>")!;
-			return err?;
+		switch (err)
+		{
+			case PrintFault.BUFFER_EXCEEDED:
+        	case PrintFault.INTERNAL_BUFFER_EXCEEDED:
+        		return f.first_err(err)?;
+        	default:
+        		err = f.first_err(PrintFault.INVALID_ARGUMENT);
+        		f.out_substr("<INVALID>")!;
+        		return err?;
+		}
 	}
 	return len;
 }