diff --git a/java/awt/dnd/DropTargetContext.java b/java/awt/dnd/DropTargetContext.java
index 4c21a6e8ad..26ec304c3c 100644
--- a/java/awt/dnd/DropTargetContext.java
+++ b/java/awt/dnd/DropTargetContext.java
@@ -161,9 +161,10 @@ protected void rejectDrop ()
 
   protected DataFlavor[] getCurrentDataFlavors ()
   {
+    DataFlavor[] flavors = null;
     if (dtcp != null)
-      dtcp.getTransferDataFlavors();
-    return null;
+      flavors = dtcp.getTransferDataFlavors();
+    return flavors != null ? flavors : new DataFlavor[0];
   }
 
   protected List<DataFlavor> getCurrentDataFlavorsAsList ()