diff --git a/commands/hugo.go b/commands/hugo.go
index 153980cb1..32846f871 100644
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -472,7 +472,9 @@ func getStaticSourceFs() afero.Fs {
 	useStatic := true
 
 	if err != nil {
-		jww.WARN.Println(err)
+		if err != helpers.ErrThemeUndefined {
+			jww.WARN.Println(err)
+		}
 		useTheme = false
 	} else {
 		if _, err := source.Stat(themeDir); os.IsNotExist(err) {
diff --git a/helpers/path.go b/helpers/path.go
index 7dea0b0dd..6e2422d05 100644
--- a/helpers/path.go
+++ b/helpers/path.go
@@ -31,6 +31,13 @@ import (
 	"golang.org/x/text/unicode/norm"
 )
 
+var (
+	// ErrThemeUndefined is returned when a theme has not be defined by the user.
+	ErrThemeUndefined = errors.New("no theme set")
+
+	ErrWalkRootTooShort = errors.New("Path too short. Stop walking.")
+)
+
 // filepathPathBridge is a bridge for common functionality in filepath vs path
 type filepathPathBridge interface {
 	Base(in string) string
@@ -207,7 +214,7 @@ func GetThemeI18nDirPath() (string, error) {
 
 func getThemeDirPath(path string) (string, error) {
 	if !ThemeSet() {
-		return "", errors.New("No theme set")
+		return "", ErrThemeUndefined
 	}
 
 	themeDir := filepath.Join(GetThemeDir(), path)
@@ -485,8 +492,6 @@ func FindCWD() (string, error) {
 	return path, nil
 }
 
-var ErrWalkRootTooShort = errors.New("Path too short. Stop walking.")
-
 // SymbolicWalk is like filepath.Walk, but it supports the root being a
 // symbolic link. It will still not follow symbolic links deeper down in
 // the file structure