diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs
index 3e1c57182b9..2b8e060ce8e 100644
--- a/src/librustdoc/config.rs
+++ b/src/librustdoc/config.rs
@@ -364,7 +364,9 @@ impl Options {
                                                 .iter()
                                                 .map(|s| (PathBuf::from(&s), s.to_owned())) {
                 if !theme_file.is_file() {
-                    diag.struct_err("option --themes arguments must all be files").emit();
+                    diag.struct_err(&format!("invalid file: \"{}\"", theme_s))
+                        .help("option --themes arguments must all be files")
+                        .emit();
                     return Err(1);
                 }
                 let (success, ret) = theme::test_theme_against(&theme_file, &paths, &diag);
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 4f102dbf128..27bef5db2d6 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -251,12 +251,12 @@ fn opts() -> Vec<RustcOptGroup> {
             o.optflag("", "sort-modules-by-appearance", "sort modules by where they appear in the \
                                                          program, rather than alphabetically")
         }),
-        unstable("themes", |o| {
+        stable("themes", |o| {
             o.optmulti("", "themes",
                        "additional themes which will be added to the generated docs",
                        "FILES")
         }),
-        unstable("theme-checker", |o| {
+        stable("theme-checker", |o| {
             o.optmulti("", "theme-checker",
                        "check if given theme is valid",
                        "FILES")