--- old/modules/javafx.graphics/src/main/native-glass/win/GlassDnD.cpp 2016-10-24 17:53:10.000000000 -0700 +++ new/modules/javafx.graphics/src/main/native-glass/win/GlassDnD.cpp 2016-10-24 17:53:10.000000000 -0700 @@ -77,6 +77,10 @@ } JLObject jDnDClipboard(env, env->CallStaticObjectMethod(jcWinDnDClipboard, midGetInstance)); ASSERT(jDnDClipboard) + result = checkJavaException(env); + if (result != S_OK) { + return result; + } IDataObject *pOldDataObj = getPtr(env, jDnDClipboard); if (pOldDataObj != pDataObj) { @@ -234,7 +238,10 @@ JLObject jDnDClipboard(env, env->CallStaticObjectMethod(jcWinDnDClipboard, midGetInstance)); ASSERT(jDnDClipboard) - + result = checkJavaException(env); + if (result != S_OK) { + return result; + } env->CallVoidMethod(jDnDClipboard, midSetSourceSupportedActions, actions); return checkJavaException(env); @@ -270,6 +277,10 @@ JLObject jDnDClipboard(env, env->CallStaticObjectMethod(jcWinDnDClipboard, midGetInstance)); ASSERT(jDnDClipboard) + result = checkJavaException(env); + if (result != S_OK) { + return result; + } env->CallVoidMethod(jDnDClipboard, midSetDragButton, button);