diff --git a/inspector/src/main/java/io/syndesis/inspector/DataMapperClassInspector.java b/inspector/src/main/java/io/syndesis/inspector/DataMapperClassInspector.java
index 45278545..1bdff15d 100644
--- a/inspector/src/main/java/io/syndesis/inspector/DataMapperClassInspector.java
+++ b/inspector/src/main/java/io/syndesis/inspector/DataMapperClassInspector.java
@@ -77,10 +77,10 @@ public List<String> getPaths(String fullyQualifiedName) {
     protected List<String> getPathsForJavaClassName(String prefix, String fullyQualifiedName, List<String> visited) {
         if (visited.contains(fullyQualifiedName)) {
             return Collections.emptyList();
-        } else {
-            visited.add(fullyQualifiedName);
         }
 
+        visited.add(fullyQualifiedName);
+
         ResponseEntity<String> response = null;
         try {
             response = restTemplate.getForEntity(getClassInspectionUrl(config, fullyQualifiedName), String.class);
@@ -113,9 +113,9 @@ protected List<String> getPathsFromJavaClassJson(String prefix, String json, Lis
                                 if (isPrimitive || isTerminal(fieldClassName)) {
                                     paths.add(prefix + DEFAULT_SEPARATOR + name);
                                     continue;
-                                } else {
-                                    paths.addAll(getPathsForJavaClassName(prefix + DEFAULT_SEPARATOR + name, fieldClassName, visited));
                                 }
+
+                                paths.addAll(getPathsForJavaClassName(prefix + DEFAULT_SEPARATOR + name, fieldClassName, visited));
                             }
                         }
                     }
@@ -132,7 +132,9 @@ protected static String getClassName(String fullyQualifiedName) {
         int index = fullyQualifiedName.lastIndexOf(".");
         if (index > 0) {
             return fullyQualifiedName.substring(index + 1);
-        } else return fullyQualifiedName;
+        }
+
+        return fullyQualifiedName;
     }
 
     /**
diff --git a/rest/src/main/java/io/syndesis/rest/v1/handler/exception/BaseExceptionMapper.java b/rest/src/main/java/io/syndesis/rest/v1/handler/exception/BaseExceptionMapper.java
index 4d723916..8298f6f5 100644
--- a/rest/src/main/java/io/syndesis/rest/v1/handler/exception/BaseExceptionMapper.java
+++ b/rest/src/main/java/io/syndesis/rest/v1/handler/exception/BaseExceptionMapper.java
@@ -31,7 +31,7 @@ abstract class BaseExceptionMapper<E extends Throwable> implements ExceptionMapp
 
     private final String userMessage;
 
-    public BaseExceptionMapper(final Status status, final String userMessage) {
+    protected BaseExceptionMapper(final Status status, final String userMessage) {
         this.status = status;
         this.userMessage = userMessage;
     }