--- a/hotspot/src/os/windows/vm/os_windows.cpp	Wed Jan 11 09:40:42 2017 +0100
+++ b/hotspot/src/os/windows/vm/os_windows.cpp	Wed Jan 11 12:47:16 2017 +0100
@@ -778,6 +778,11 @@
   // is already attached to a debugger; debugger must observe
   // the exception below to show the correct name.
 
+  // If there is no debugger attached skip raising the exception
+  if (!IsDebuggerPresent()) {
+    return;
+  }
+
   const DWORD MS_VC_EXCEPTION = 0x406D1388;
   struct {
     DWORD dwType;     // must be 0x1000