diff --git a/pkg/chartutil/load.go b/pkg/chartutil/load.go
index 1eb1bb3b2..ca06c0c89 100644
--- a/pkg/chartutil/load.go
+++ b/pkg/chartutil/load.go
@@ -151,9 +151,12 @@ func loadFiles(files []*afile) (*chart.Chart, error) {
 	}
 
 	// Ensure that we got a Chart.yaml file
-	if c.Metadata == nil || c.Metadata.Name == "" {
+	if c.Metadata == nil {
 		return c, errors.New("chart metadata (Chart.yaml) missing")
 	}
+	if c.Metadata.Name == "" {
+		return c, errors.New("invalid chart (Chart.yaml): name must not be empty")
+	}
 
 	for n, files := range subcharts {
 		var sc *chart.Chart