@@ -201,6 +201,7 @@ static private Optional<String> getMatchingRefURL(IProblem compilerError, ASTNod
       case IProblem.ShouldReturnValue:
         return urlAssembler.getMissingReturnURL(problemNode);
       case IProblem.TypeMismatch:
+      case IProblem.ReturnTypeMismatch:
         String providedType = truncateClass(problemArguments[0]);
         String requiredType = truncateClass(problemArguments[1]);
         return urlAssembler.getTypeMismatchURL(providedType, requiredType, problemNode);
 
@@ -309,13 +309,7 @@ public Optional<String> getMissingReturnURL(ASTNode problemNode) {
      * @return the the URL with path and parameters for the corresponding MatchingRef page
      */
     public Optional<String> getTypeMismatchURL(String providedType, String requiredType, ASTNode problemNode) {
-        ASTNode parent = problemNode.getParent();
-        if (!(parent instanceof VariableDeclarationFragment)) {
-            return Optional.empty();
-        }
-
-        String varName = ((VariableDeclarationFragment) parent).getName().toString();
-
+        String varName = problemNode.toString();
         return Optional.of(URL + "typemismatch?typeonename=" + providedType
                 + "&typetwoname=" + requiredType
                 + "&varname=" + varName);