--- a/src/hotspot/os/windows/os_windows.cpp	Thu Aug 15 13:41:30 2019 -0700
+++ b/src/hotspot/os/windows/os_windows.cpp	Thu Aug 15 19:29:58 2019 +0000
@@ -4122,7 +4122,7 @@
   // in order to forward implicit exceptions from code in AOT
   // generated DLLs.  This is necessary since these DLLs are not
   // registered for structured exceptions like codecache methods are.
-  if (UseAOT) {
+  if (AOTLibrary != NULL && (UseAOT || FLAG_IS_DEFAULT(UseAOT))) {
     topLevelVectoredExceptionHandler = AddVectoredExceptionHandler( 1, topLevelVectoredExceptionFilter);
   }
 #endif