diff --git a/Go-latest.vsix b/Go-latest.vsix
index 196c18340..ba3f9bc59 100644
Binary files a/Go-latest.vsix and b/Go-latest.vsix differ
diff --git a/package.json b/package.json
index 071f5a5b5..eb98ef710 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Go",
-  "version": "0.6.86",
+  "version": "0.6.87-beta.1",
   "publisher": "ms-vscode",
   "description": "Rich Go language support for Visual Studio Code",
   "author": {
diff --git a/src/goSuggest.ts b/src/goSuggest.ts
index 2d70ce608..e42dbfea0 100644
--- a/src/goSuggest.ts
+++ b/src/goSuggest.ts
@@ -146,6 +146,10 @@ export class GoCompletionItemProvider implements vscode.CompletionItemProvider {
 	private runGoCode(document: vscode.TextDocument, filename: string, inputText: string, offset: number, inString: boolean, position: vscode.Position, lineText: string, currentWord: string, includeUnimportedPkgs: boolean, config: vscode.WorkspaceConfiguration): Thenable<vscode.CompletionItem[]> {
 		return new Promise<vscode.CompletionItem[]>((resolve, reject) => {
 			let gocode = getBinPath('gocode');
+			if (!path.isAbsolute(gocode)) {
+				promptForMissingTool(gocode);
+				return reject();
+			}
 
 			// Unset GOOS and GOARCH for the `gocode` process to ensure that GOHOSTOS and GOHOSTARCH
 			// are used as the target operating system and architecture. `gocode` is unable to provide