diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java
index 7e7bf68d0..ff3d834a7 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java
@@ -18,7 +18,10 @@ import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.eclipse.core.runtime.FileLocator;
@@ -36,7 +39,7 @@ import org.osgi.framework.Bundle;
 /**
  * @author Martin Lippert
  */
-@SuppressWarnings("restriction")
+@SuppressWarnings({ "restriction", "unchecked" })
 public class CloudFoundryManifestLanguageServer extends ProcessStreamConnectionProvider {
 	
 	private static LanguageServerProcessReaper processReaper = new LanguageServerProcessReaper();
@@ -44,7 +47,11 @@ public class CloudFoundryManifestLanguageServer extends ProcessStreamConnectionP
 	private LanguageServer languageServer;
 	private URI rootPath;
 
-	private static Object cfTargetOptionSettings = null;
+	private static Object cfTargetOptionSettings = new HashMap<String, Object>();
+	// Default configuration data
+	static {
+		((Map<String,Object>)cfTargetOptionSettings).put("cfClientParams", Collections.EMPTY_LIST);
+	}
 	private static List<CloudFoundryManifestLanguageServer> servers = new CopyOnWriteArrayList<>();
 
 	public CloudFoundryManifestLanguageServer() {