3 files changed, 16 insertions, 8 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/Animator.java b/src/jogl/classes/com/jogamp/opengl/util/Animator.java
index 4d61adaa6..c7a03eddb 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/Animator.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/Animator.java
@@ -237,11 +237,14 @@ public class Animator extends AnimatorBase {
                     stopIssued = false;
                     pauseIssued = false;
                     isAnimating = false;
-                    if( null != displayCaught ) {
-                        handleUncaughtException(displayCaught);
+                    try {
+                        if( null != displayCaught ) {
+                            handleUncaughtException(displayCaught); // may throw exception if null handler
+                        }
+                    } finally {
+                        animThread = null;
+                        Animator.this.notifyAll();
                     }
-                    animThread = null;
-                    Animator.this.notifyAll();
                 }
             }
         }
diff --git a/src/jogl/classes/com/jogamp/opengl/util/FPSAnimator.java b/src/jogl/classes/com/jogamp/opengl/util/FPSAnimator.java
index ec6c8aae7..dc4a9a896 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/FPSAnimator.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/FPSAnimator.java
@@ -232,11 +232,14 @@ public class FPSAnimator extends AnimatorBase {
                             }
                         }
                         isAnimating = false;
-                        if( null != displayCaught ) {
-                            handleUncaughtException(displayCaught);
+                        try {
+                            if( null != displayCaught ) {
+                                handleUncaughtException(displayCaught); // may throw exception if null handler
+                            }
+                        } finally {
+                            animThread = null;
+                            FPSAnimator.this.notifyAll();
                         }
-                        animThread = null;
-                        FPSAnimator.this.notifyAll();
                     }
                 }
             }
diff --git a/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java b/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java
index 25ff83fc0..f770f2a59 100644
--- a/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java
+++ b/src/jogl/classes/jogamp/opengl/GLDrawableHelper.java
@@ -899,6 +899,7 @@ public class GLDrawableHelper {
                     if( isGLThread ) {
                         // Run immediately, don't defer since locked by this thread, but isGLThread
                         deferredHere = false;
+                        wait = false;
                     } else {
                         // Locked by this thread, but _not_ isGLThread -> ERROR
                         throw new IllegalStateException("Deferred, wait, isLocked on current and not GL-Thread: thread "+Thread.currentThread());
@@ -964,6 +965,7 @@ public class GLDrawableHelper {
                     if( isGLThread ) {
                         // Run immediately, don't defer since locked by this thread, but isGLThread
                         deferredHere = false;
+                        wait = false;
                     } else {
                         // Locked by this thread, but _not_ isGLThread -> ERROR
                         throw new IllegalStateException("Deferred, wait, isLocked on current and not GL-Thread: thread "+Thread.currentThread());