diff --git a/commands/commands_test.go b/commands/commands_test.go
index d576b4428..907f003c0 100644
--- a/commands/commands_test.go
+++ b/commands/commands_test.go
@@ -235,11 +235,6 @@ Single: {{ .Title }}
 
 List: {{ .Title }}
 
-`)
-
-	writeFile(t, filepath.Join(d, "static", "my.txt"), `
-MyMy
-
 `)
 
 	return d, nil
diff --git a/commands/hugo.go b/commands/hugo.go
index c4fee122d..5c87bd96e 100644
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -277,7 +277,10 @@ func (c *commandeer) fullBuild() error {
 	copyStaticFunc := func() error {
 		cnt, err := c.copyStatic()
 		if err != nil {
-			return fmt.Errorf("Error copying static files: %s", err)
+			if !os.IsNotExist(err) {
+				return fmt.Errorf("Error copying static files: %s", err)
+			}
+			c.Logger.WARN.Println("No Static directory found")
 		}
 		langCount = cnt
 		langCount = cnt