diff --git a/pkg/chartutil/create.go b/pkg/chartutil/create.go
index 319a75e2f..c6c1308ca 100644
--- a/pkg/chartutil/create.go
+++ b/pkg/chartutil/create.go
@@ -305,8 +305,9 @@ func CreateFrom(chartfile *chart.Metadata, dest string, src string) error {
 	}
 
 	schart.Templates = updatedTemplates
-	schart.Values = &chart.Config{Raw: string(Transform(schart.Values.Raw, "<CHARTNAME>", schart.Metadata.Name))}
-
+	if schart.Values != nil {
+		schart.Values = &chart.Config{Raw: string(Transform(schart.Values.Raw, "<CHARTNAME>", schart.Metadata.Name))}
+	}
 	return SaveDir(schart, dest)
 }