diff --git a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java
index b375c8ea4..00010fcb7 100644
--- a/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java
+++ b/vscode-extensions/vscode-manifest-yaml/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java
@@ -53,12 +53,15 @@ public class ManifestYmlSchema implements YamlSchema {
 		YAtomicType t_path = f.yatomic("Path");
 		
 		YAtomicType t_buildpack = f.yatomic("Buildpack");
-		t_buildpack.addHintProvider(this.buildpackProvider);
+		if (this.buildpackProvider != null) {
+			t_buildpack.addHintProvider(this.buildpackProvider);
+//			t_buildpack.parseWith(ManifestYmlValueParsers.fromHints(t_buildpack.toString(), buildpackProvider));
+		}
 		
 		YAtomicType t_service_string = f.yatomic("String");
 		if (servicesProvider != null) {
 			t_service_string.addHintProvider(servicesProvider);
-//			t_service_string.parseWith(ManifestYmlValueParsers.fromHints(t_service_string.toString(), servicesProvider));
+			t_service_string.parseWith(ManifestYmlValueParsers.fromHints(t_service_string.toString(), servicesProvider));
 		}
 		YType t_services = f.yseq(t_service_string);