diff --git a/helpers/path.go b/helpers/path.go
index a31f33948..1d3419fb2 100644
--- a/helpers/path.go
+++ b/helpers/path.go
@@ -183,13 +183,15 @@ func GetThemeDataDirPath() (string, error) {
 }
 
 func getThemeDirPath(path string) (string, error) {
-	var themeDir string
-	if ThemeSet() {
-		themeDir = filepath.Join(GetThemeDir(), path)
-		if _, err := os.Stat(themeDir); os.IsNotExist(err) {
-			return "", fmt.Errorf("Unable to find %s directory for theme %s in %s", path, viper.GetString("theme"), themeDir)
-		}
+	if !ThemeSet() {
+		return "", errors.New("No theme set")
 	}
+
+	themeDir := filepath.Join(GetThemeDir(), path)
+	if _, err := os.Stat(themeDir); os.IsNotExist(err) {
+		return "", fmt.Errorf("Unable to find %s directory for theme %s in %s", path, viper.GetString("theme"), themeDir)
+	}
+
 	return themeDir, nil
 }