diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java
index b06bf41ca..22a1a35c0 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageClientImpl.java
@@ -430,7 +430,9 @@ public class STS4LanguageClientImpl extends LanguageClientImpl implements STS4La
 				if (element != null ) {
 					IJavaProject project = element.getJavaProject() == null ? ResourceUtils.getJavaProject(projectUri) : element.getJavaProject();
 					if (project != null) {
-						return new Location(Utils.eclipseIntroUri(project.getElementName(), params.getBindingKey()).toString(), null);
+						Location location = new Location();
+						location.setUri(Utils.eclipseIntroUri(project.getElementName(), params.getBindingKey()).toString());
+						return location;
 					}
 				}
 			} catch (Exception e) {
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/Utils.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/Utils.java
index 3c55fda75..935e28852 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/Utils.java
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/Utils.java
@@ -31,7 +31,7 @@ import org.eclipse.ui.PlatformUI;
 @SuppressWarnings("restriction")
 public class Utils {
 
-	private static final String URL_PREFIX = "https://org.eclipse.ui.intro/execute?command=";
+	private static final String URL_PREFIX = "http://org.eclipse.ui.intro/execute?command=";
 	private static final String EQUALS = "=";
 	private static final String PARAMETERS_SEPARATOR = ",";
 	private static final String PARAMETERS_START = "(";
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/EclipseJavaElementLocationProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/EclipseJavaElementLocationProvider.java
index 32d4aadfd..84da4dc0a 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/EclipseJavaElementLocationProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/EclipseJavaElementLocationProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 Pivotal, Inc.
+ * Copyright (c) 2019 Pivotal, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -21,7 +21,13 @@ public class EclipseJavaElementLocationProvider implements JavaElementLocationPr
 	@Override
 	public Location findLocation(IJavaProject project, IMember member) {
 		URI uri = EclipseSourceLinks.eclipseIntroUri(project, member);
-		return uri == null ? null : new Location(uri.toString(), null);
+		if (uri == null) {
+			return null;
+		} else {
+			Location location = new Location();
+			location.setUri(uri.toString());
+			return location;
+		}
 	}
 
 }
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/EclipseSourceLinks.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/EclipseSourceLinks.java
index bab42a7e5..eb83225d3 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/EclipseSourceLinks.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/links/EclipseSourceLinks.java
@@ -31,7 +31,7 @@ import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFin
  */
 public class EclipseSourceLinks implements SourceLinks {
 
-	private static final String URL_PREFIX = "https://org.eclipse.ui.intro/execute?command=";
+	private static final String URL_PREFIX = "http://org.eclipse.ui.intro/execute?command=";
 	private static final String EQUALS = "=";
 	private static final String PARAMETERS_SEPARATOR = ",";
 	private static final String PARAMETERS_START = "(";