diff --git a/EndlessClient/GameExecution/EndlessGame.cs b/EndlessClient/GameExecution/EndlessGame.cs
index 4723e1bd1..a0222d461 100644
--- a/EndlessClient/GameExecution/EndlessGame.cs
+++ b/EndlessClient/GameExecution/EndlessGame.cs
@@ -102,10 +102,10 @@ protected override void Initialize()
 
             Components.ComponentRemoved += (o, e) =>
             {
-                if (e.GameComponent is PacketHandlerGameComponent)
-                {
-                    throw new InvalidOperationException("Packet handler game component should never be removed from Game components");
-                }
+                //if (e.GameComponent is PacketHandlerGameComponent)
+                //{
+                //    throw new InvalidOperationException("Packet handler game component should never be removed from Game components");
+                //}
             };
 
             base.Initialize();
@@ -185,9 +185,6 @@ protected override void Update(GameTime gameTime)
             {
                 // hide "failed to compare two elements in the array" error from Monogame
             }
-            catch (ArgumentOutOfRangeException)
-            {
-            }
         }
 
 #endif