diff --git a/internal/errors/fatal.go b/internal/errors/fatal.go
index b61822c00..02ffdaab4 100644
--- a/internal/errors/fatal.go
+++ b/internal/errors/fatal.go
@@ -34,5 +34,5 @@ func Fatal(s string) error {
 
 // Fatalf returns an error which implements the Fataler interface.
 func Fatalf(s string, data ...interface{}) error {
-	return fatalError(fmt.Sprintf(s, data...))
+	return Wrap(fatalError(fmt.Sprintf(s, data...)), "Fatal")
 }
diff --git a/internal/options/options_test.go b/internal/options/options_test.go
index ecdd918aa..de94fc90a 100644
--- a/internal/options/options_test.go
+++ b/internal/options/options_test.go
@@ -65,11 +65,11 @@ var invalidOptsTests = []struct {
 }{
 	{
 		[]string{"=bar", "bar=baz", "k="},
-		"empty key is not a valid option",
+		"Fatal: empty key is not a valid option",
 	},
 	{
 		[]string{"x=1", "foo=bar", "y=2", "foo=baz"},
-		`key "foo" present more than once`,
+		`Fatal: key "foo" present more than once`,
 	},
 }
 
@@ -185,7 +185,7 @@ var invalidSetTests = []struct {
 			"first_name": "foobar",
 		},
 		"ns",
-		"option ns.first_name is not known",
+		"Fatal: option ns.first_name is not known",
 	},
 	{
 		Options{