diff --git a/hugolib/site.go b/hugolib/site.go
index 2e28b3f0f..ee4add770 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -539,7 +539,9 @@ func (s *Site) RenderHomePage() error {
 			return err
 		}
 		err = s.WritePublic("404.html", x)
-		return err
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil