diff --git a/core/api/main/java/org/directwebremoting/util/LocalUtil.java b/core/api/main/java/org/directwebremoting/util/LocalUtil.java
index ff163f756..a29ebfcf0 100644
--- a/core/api/main/java/org/directwebremoting/util/LocalUtil.java
+++ b/core/api/main/java/org/directwebremoting/util/LocalUtil.java
@@ -1177,9 +1177,8 @@ public static Class<?> classForName(String className) throws ClassNotFoundExcept
         }
 
         String remappedClassName = remappedDwrClassName(className);
-        Class<?> clazz = null;
         try {
-            clazz = Thread.currentThread().getContextClassLoader().loadClass(remappedClassName);
+            return Thread.currentThread().getContextClassLoader().loadClass(remappedClassName);
         } catch(ClassNotFoundException ex) {
             // fall through
         } catch(IllegalArgumentException ex) {
@@ -1188,13 +1187,11 @@ public static Class<?> classForName(String className) throws ClassNotFoundExcept
         }
 
         try {
-            clazz = LocalUtil.class.getClassLoader().loadClass(remappedClassName);
+            return LocalUtil.class.getClassLoader().loadClass(remappedClassName);
         } catch(IllegalArgumentException ex) {
             // Conform to JDK classloader behaviour where illegal classnames are handled as ClassNotFound
             throw new ClassNotFoundException(ex.getMessage(), ex);
         }
-
-        return clazz;
     }
 
     /**