diff --git a/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java b/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java
index 79abdc17d..2b16f4500 100644
--- a/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java
+++ b/headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java
@@ -1234,6 +1234,23 @@ public class ManifestYamlEditorTest {
 		assertEquals("an-org : a-space [test.io]", completion.getDocumentation());
 	}
 
+	@Test
+	public void buildbackContentAssistNoTargets() throws Exception {
+		ClientRequests cfClient = cloudfoundry.client;
+
+		CFBuildpack buildPack = Mockito.mock(CFBuildpack.class);
+		when(buildPack.getName()).thenReturn("java_buildpack");
+		when(cfClient.getBuildpacks()).thenReturn(ImmutableList.of(buildPack));
+
+		String title = "No targets";
+		String description = "Use CLI to login";
+		when(cloudfoundry.paramsProvider.getParams()).thenThrow(new NoTargetsException(title + ": " + description));
+
+		CompletionItem completion = assertCompletions("buildpack: <*>", "buildpack: <*>").get(0);
+		assertEquals(title, completion.getLabel());
+		assertEquals(description, completion.getDocumentation());
+	}
+
 	@Test
 	public void domainContentAssist() throws Exception {
 		ClientRequests cfClient = cloudfoundry.client;