1 files changed, 6 insertions, 0 deletions
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/awt/JAWTWindow.java b/src/nativewindow/classes/com/jogamp/nativewindow/awt/JAWTWindow.java
index 0d6e4e71c..1dce7428f 100644
--- a/src/nativewindow/classes/com/jogamp/nativewindow/awt/JAWTWindow.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/awt/JAWTWindow.java
@@ -302,6 +302,9 @@ public abstract class JAWTWindow implements NativeWindow, OffscreenLayerSurface,
         System.err.println(jawtStr2("setAWTGraphicsConfiguration")+": "+this.awtConfig+" -> "+config);
         // Thread.dumpStack();
     }
+    if( null == awtConfig ) {
+        throw new IllegalArgumentException(jawtStr2("")+": null config");
+    }
     this.awtConfig = config;
   }
   /**
@@ -775,6 +778,9 @@ public abstract class JAWTWindow implements NativeWindow, OffscreenLayerSurface,
 
   @Override
   public final AbstractGraphicsConfiguration getGraphicsConfiguration() {
+    if( null == awtConfig ) {
+        throw new NativeWindowException(jawtStr2("")+": null awtConfig, invalidated");
+    }
     return awtConfig.getNativeGraphicsConfiguration();
   }