diff --git a/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java b/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java
index 431a1e000d4..6cdebce8f09 100644
--- a/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java
+++ b/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java
@@ -194,6 +194,9 @@ public class CGraphicsDevice extends GraphicsDevice {
 
     @Override
     public void setDisplayMode(DisplayMode dm) {
+        if (dm == null) {
+            throw new IllegalArgumentException("Invalid display mode");
+        }
         nativeSetDisplayMode(displayID, dm.getWidth(), dm.getHeight(), dm.getBitDepth(), dm.getRefreshRate());
         if (isFullScreenSupported() && getFullScreenWindow() != null) {
             getFullScreenWindow().setSize(dm.getWidth(), dm.getHeight());