diff --git a/platform/platform-impl/src/com/intellij/ide/dnd/DnDManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/dnd/DnDManagerImpl.java
index c15a469c8915..b1c9ac1ed33b 100644
--- a/platform/platform-impl/src/com/intellij/ide/dnd/DnDManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/dnd/DnDManagerImpl.java
@@ -159,7 +159,10 @@ public class DnDManagerImpl extends DnDManager implements DnDEvent.DropTargetHig
 
     if (currentEvent == null) return currentEvent;
 
-    currentEvent.updateAction(getDnDActionForPlatformAction(nativeAction));
+    final DnDAction dndAction = getDnDActionForPlatformAction(nativeAction);
+    if (dndAction == null) return null;
+
+    currentEvent.updateAction(dndAction);
     currentEvent.setPoint(aPoint);
     currentEvent.setHandlerComponent(aComponentOverDragging);