diff --git a/internal/cmd/avogen/main.go b/internal/cmd/avogen/main.go
index 7562b18..8440f35 100644
--- a/internal/cmd/avogen/main.go
+++ b/internal/cmd/avogen/main.go
@@ -73,13 +73,14 @@ func main() {
 	}
 
 	// Generate output.
-	b, err := g.Generate(is)
-	if err != nil {
-		log.Fatal(err)
-	}
+	b, generr := g.Generate(is)
 
 	// Write.
 	if _, err := w.Write(b); err != nil {
 		log.Fatal(err)
 	}
+
+	if generr != nil {
+		log.Fatal(generr)
+	}
 }
diff --git a/internal/gen/gen.go b/internal/gen/gen.go
index e33ff1a..6fbbcaf 100644
--- a/internal/gen/gen.go
+++ b/internal/gen/gen.go
@@ -30,6 +30,10 @@ func GoFmt(i Interface) Interface {
 		if err != nil {
 			return nil, err
 		}
-		return format.Source(b)
+		formatted, err := format.Source(b)
+		if err != nil {
+			return b, err
+		}
+		return formatted, nil
 	})
 }