--- a/hotspot/src/os/windows/vm/os_windows.cpp	Fri Apr 18 10:55:41 2014 -0700
+++ b/hotspot/src/os/windows/vm/os_windows.cpp	Thu Apr 24 00:46:17 2014 +0200
@@ -130,6 +130,13 @@
     case DLL_PROCESS_DETACH:
       if(ForceTimeHighResolution)
         timeEndPeriod(1L);
+
+      // Workaround for issue when a custom launcher doesn't call
+      // DestroyJavaVM and NMT is trying to track memory when free is
+      // called from a static destructor
+      if (MemTracker::is_on()) {
+          MemTracker::shutdown(MemTracker::NMT_normal);
+      }
       break;
     default:
       break;