diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessLiveDataExtractorOverJMX.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessLiveDataExtractorOverJMX.java
index 752b875b5..9b39c1f40 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessLiveDataExtractorOverJMX.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/livehover/v2/SpringProcessLiveDataExtractorOverJMX.java
@@ -148,13 +148,13 @@ public class SpringProcessLiveDataExtractorOverJMX {
 
 					if (metricsData instanceof String) {
 						return RequestMappingMetrics.parse((String) metricsData);
-					} else {
+					} else if (metricsData != null) {
 						return RequestMappingMetrics.parse(gson.toJson(metricsData));
 					}
 				} catch (Exception e) {
 					log.error("", e);
-					return null;
 				}
+				return null;
 			}
 		};
 	}
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java
index ca037e831..1a95cfbb5 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java
@@ -321,11 +321,11 @@ public class RequestMappingHoverProvider implements HoverProvider {
 
 		if (StringUtil.hasText(content)) {
 			
-			codeLens.setData(content);
-			
-			StringBuilder codeLenseContent = new StringBuilder(content);
 			if (metrics != null) {
 				char timeUnitShort = metrics.getTimeUnit().name().charAt(0);
+				
+				StringBuilder codeLenseContent = new StringBuilder(content);
+
 				codeLenseContent.append('(');
 				codeLenseContent.append("Count=");
 				codeLenseContent.append(metrics.getCallsCount());
@@ -338,9 +338,12 @@ public class RequestMappingHoverProvider implements HoverProvider {
 				codeLenseContent.append(metrics.getMaxTime());
 				codeLenseContent.append(timeUnitShort);
 				codeLenseContent.append(')');
-			}
-			cmd.setTitle(codeLenseContent.toString());
 
+				content  = codeLenseContent.toString();
+			} 
+			
+			codeLens.setData(content);
+			cmd.setTitle(content);
 			cmd.setCommand("sts.open.url");
 			cmd.setArguments(ImmutableList.of(content));
 		}