diff --git a/sootup.jimple.frontend/src/main/java/sootup/jimple/frontend/JimpleView.java b/sootup.jimple.frontend/src/main/java/sootup/jimple/frontend/JimpleView.java
index bb169ec5f5..966174d9d4 100644
--- a/sootup.jimple.frontend/src/main/java/sootup/jimple/frontend/JimpleView.java
+++ b/sootup.jimple.frontend/src/main/java/sootup/jimple/frontend/JimpleView.java
@@ -129,11 +129,11 @@ Optional<SootClass> getAbstractClass(@Nonnull ClassType type) {
                   .collect(Collectors.joining(",")),
           foundClassSources.get(0).getSourcePath());
     }
-    return buildClassFrom(foundClassSources.get(0));
+    return Optional.of(buildClassFrom(foundClassSources.get(0)));
   }
 
   @Nonnull
-  private synchronized Optional<SootClass> buildClassFrom(AbstractClassSource classSource) {
+  private synchronized SootClass buildClassFrom(AbstractClassSource classSource) {
 
     ClassType classType = classSource.getClassType();
     SootClass theClass;
@@ -144,7 +144,7 @@ private synchronized Optional<SootClass> buildClassFrom(AbstractClassSource clas
       theClass = cache.getClass(classType);
     }
 
-    return Optional.of(theClass);
+    return theClass;
   }
 
   private synchronized void resolveAll() {