diff --git a/Project-Aurora/Project-Aurora/Devices/Uniwill/UniwillDevice.cs b/Project-Aurora/Project-Aurora/Devices/Uniwill/UniwillDevice.cs
index e00953423..240d36302 100644
--- a/Project-Aurora/Project-Aurora/Devices/Uniwill/UniwillDevice.cs
+++ b/Project-Aurora/Project-Aurora/Devices/Uniwill/UniwillDevice.cs
@@ -65,13 +65,14 @@ private void ChoiceGamingCenter()
 
         private GAMECENTERTYPE CheckGC()
         {
-            try
+            int? Control = (int?)Registry.GetValue(keyName, "AuroraSwitch", null);
+            
+            if(Control.HasValue)
             {
-                int Control = (int)Registry.GetValue(keyName, "AuroraSwitch", null);
                 GamingCenterType = GAMECENTERTYPE.GAMINGTCENTER;
-                SwitchOn = Control;
+                SwitchOn = Control.Value;
             }
-            catch
+            else
             {
                 GamingCenterType = GAMECENTERTYPE.NONE;
                 SwitchOn = 0;
@@ -148,7 +149,7 @@ public bool Initialize()
                 }
                 catch
                 {
-                    Debug.WriteLine("Uniwill device error!");
+                    Global.logger.Error("Uniwill device error!");
                 }
                 // Mark Initialized = FALSE
                 isInitialized = false;