diff --git a/cmd/telegraf/main.go b/cmd/telegraf/main.go
index 00d9d06f9..6bf329d9b 100644
--- a/cmd/telegraf/main.go
+++ b/cmd/telegraf/main.go
@@ -374,7 +374,11 @@ func runApp(args []string, outputBuffer io.Writer, pprof Server, c TelegrafConfi
 	defer memguard.Purge()
 	defer logger.CloseLogging()
 
-	return app.Run(args)
+	if err := app.Run(args); err != nil {
+		log.Printf("E! %s", err)
+		return err
+	}
+	return nil
 }
 
 func main() {
@@ -385,6 +389,6 @@ func main() {
 	pprof := NewPprofServer()
 	c := config.NewConfig()
 	if err := runApp(os.Args, os.Stdout, pprof, c, &agent); err != nil {
-		log.Fatalf("E! %s", err)
+		os.Exit(1)
 	}
 }