--- old/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp	2015-11-25 11:36:40.141743371 -0800
+++ new/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp	2015-11-25 11:36:40.021743374 -0800
@@ -2357,6 +2357,9 @@
 
     int width = ::GetSystemMetrics(SM_CXSCREEN);
 
+    if (!Devices::GetInstance()) {
+        Devices::UpdateInstance(env);
+    }
     Devices::InstanceAccess devices;
     AwtWin32GraphicsDevice *device = devices->GetDevice(
                         AwtWin32GraphicsDevice::GetDefaultDeviceIndex());
@@ -2376,6 +2379,10 @@
     TRY;
 
     int height = ::GetSystemMetrics(SM_CYSCREEN);
+
+    if (!Devices::GetInstance()) {
+        Devices::UpdateInstance(env);
+    }
     Devices::InstanceAccess devices;
     AwtWin32GraphicsDevice *device = devices->GetDevice(
                         AwtWin32GraphicsDevice::GetDefaultDeviceIndex());