diff --git a/pkg/chartutil/create.go b/pkg/chartutil/create.go
index 9f2a8cc1f..4c6b484a9 100644
--- a/pkg/chartutil/create.go
+++ b/pkg/chartutil/create.go
@@ -307,8 +307,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)
 }