diff --git a/jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java b/jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java
index 3c1691545f4..400553dd854 100644
--- a/jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java
+++ b/jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java
@@ -145,11 +145,7 @@ public class DataFlavor implements Externalizable, Cloneable {
         } catch (SecurityException exception) {
             // ignore secured class loaders
         }
-        if (fallback != null) {
-            return Class.forName(className, true, fallback);
-        } else {
-            throw new ClassNotFoundException(className);
-        }
+        return Class.forName(className, true, fallback);
     }
 
     /*