diff --git a/Horse Isle Server/HorseIsleServer/Player/User.cs b/Horse Isle Server/HorseIsleServer/Player/User.cs
index 32e80a2..bb39e7b 100755
--- a/Horse Isle Server/HorseIsleServer/Player/User.cs	
+++ b/Horse Isle Server/HorseIsleServer/Player/User.cs	
@@ -258,9 +258,22 @@ namespace HISP.Player
             }
             set
             {
-                money = value;
-                Database.SetPlayerMoney(value, Id);
-                GameServer.UpdatePlayer(LoggedinClient);
+                try
+                {
+                    checked
+                    {
+                        money = value;
+                        Database.SetPlayerMoney(value, Id);
+                        GameServer.UpdatePlayer(LoggedinClient);
+                    }
+                }
+                catch(OverflowException)
+                {
+                    money = 2147483647;
+                    Database.SetPlayerMoney(2147483647, Id);
+                    GameServer.UpdatePlayer(LoggedinClient);
+                }
+
             }
         }