diff --git a/vscode-extensions/commons-vscode/package.json b/vscode-extensions/commons-vscode/package.json
index b776ff1e8..14294d6c9 100644
--- a/vscode-extensions/commons-vscode/package.json
+++ b/vscode-extensions/commons-vscode/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pivotal-tools/commons-vscode",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "commons-vscode",
   "license": "MIT",
   "repository": "",
diff --git a/vscode-extensions/commons-vscode/src/launch-util.ts b/vscode-extensions/commons-vscode/src/launch-util.ts
index eef9b0374..85ea9fd46 100644
--- a/vscode-extensions/commons-vscode/src/launch-util.ts
+++ b/vscode-extensions/commons-vscode/src/launch-util.ts
@@ -45,7 +45,7 @@ function getUserDefinedJvmHeap(wsOpts : VSCode.WorkspaceConfiguration,  dflt : s
         return dflt;
     }
     let javaOptions : JavaOptions = wsOpts.get("java");
-    return javaOptions.heap || dflt;
+    return (javaOptions && javaOptions.heap) || dflt;
 }
 
 export function activate(options: ActivatorOptions, context: VSCode.ExtensionContext): Thenable<LanguageClient> {
@@ -112,6 +112,7 @@ export function activate(options: ActivatorOptions, context: VSCode.ExtensionCon
                             let logfile = Path.join(tmpdir(), options.extensionId + '-' + Date.now()+'.log');
                             log('Redirecting server logs to ' + logfile);
                             const args = [
+                                '-Dspring.lsp.client-port='+port,
                                 '-Dserver.port=' + port,
                                 '-Dsts.lsp.client=vscode',
                                 '-Dsts.log.file=' + logfile