diff --git a/gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java b/gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java
index d31e2ce..14b484e 100644
--- a/gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java
+++ b/gerrit-launcher/src/main/java/com/google/gerrit/launcher/GerritLauncher.java
@@ -118,12 +118,14 @@
     Class<?> clazz;
     try {
       try {
-        clazz = Class.forName(pkg + "." + name, true, loader);
+        String cn = name;
+        if (cn.equals(cn.toLowerCase())) {
+          cn = cn.substring(0, 1).toUpperCase() + cn.substring(1);
+        }
+        clazz = Class.forName(pkg + "." + cn, true, loader);
       } catch (ClassNotFoundException cnfe) {
         if (name.equals(name.toLowerCase())) {
-          String first = name.substring(0, 1).toUpperCase();
-          String cn = first + name.substring(1);
-          clazz = Class.forName(pkg + "." + cn, true, loader);
+          clazz = Class.forName(pkg + "." + name, true, loader);
         } else {
           throw cnfe;
         }