diff --git a/Source/OpenTK/Platform/Windows/WinFactory.cs b/Source/OpenTK/Platform/Windows/WinFactory.cs
index d09b4de2..6f57024e 100644
--- a/Source/OpenTK/Platform/Windows/WinFactory.cs
+++ b/Source/OpenTK/Platform/Windows/WinFactory.cs
@@ -163,7 +163,12 @@ namespace OpenTK.Platform.Windows
             {
                 if (manual)
                 {
-                    rawinput_driver.Dispose();
+                    WinRawInput raw = rawinput_driver;
+                    if (raw != null)
+                    {
+                        raw.Dispose();
+                        rawinput_driver = null;
+                    }
                 }
 
                 base.Dispose(manual);