1 files changed, 7 insertions, 3 deletions
diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
index ea92b38fd..03d14f758 100644
--- a/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
+++ b/src/jogl/classes/jogamp/opengl/windows/wgl/WindowsWGLGraphicsConfigurationFactory.java
@@ -521,9 +521,13 @@ public class WindowsWGLGraphicsConfigurationFactory extends GLGraphicsConfigurat
                 if( 0 <= chosenIdx ) {
                     if( _skipCapsChooser ) {
                         final WGLGLCapabilities caps = WindowsWGLGraphicsConfiguration.PFD2GLCapabilities(device, glProfile, hdc, chosenPFDID, winattrmask);
-                        availableCaps.add(caps);
-                        recommendedIndex = 0;
-                        skipCapsChooser = true;
+                        if(null != caps) {
+                            availableCaps.add(caps);
+                            recommendedIndex = 0;
+                            skipCapsChooser = true;
+                        } else {
+                        	skipCapsChooser = false;
+                        }
                     } else {
                         skipCapsChooser = false;
                     }