diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 5988b05084..84bd953068 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -348,7 +348,10 @@ namespace osu.Game.Beatmaps.Formats
                     CustomSampleBank = customSampleBank
                 });
             }
-            catch (FormatException e)
+            catch (FormatException)
+            {
+            }
+            catch (OverflowException)
             {
             }
         }
diff --git a/osu.Game/Beatmaps/Formats/Parsing.cs b/osu.Game/Beatmaps/Formats/Parsing.cs
index 777a85dc93..c3efb8c760 100644
--- a/osu.Game/Beatmaps/Formats/Parsing.cs
+++ b/osu.Game/Beatmaps/Formats/Parsing.cs
@@ -15,11 +15,14 @@ namespace osu.Game.Beatmaps.Formats
 
         public const double MAX_PARSE_VALUE = int.MaxValue;
 
-        public static double ParseFloat(string input, float parseLimit = (float)MAX_PARSE_VALUE)
+        public static float ParseFloat(string input, float parseLimit = (float)MAX_PARSE_VALUE)
         {
             var output = float.Parse(input, CultureInfo.InvariantCulture);
-            if (output < -parseLimit) throw new FormatException("Value is too low");
-            if (output > parseLimit) throw new FormatException("Value is too high");
+
+            if (output < -parseLimit) throw new OverflowException("Value is too low");
+            if (output > parseLimit) throw new OverflowException("Value is too high");
+
+            if (float.IsNaN(output)) throw new FormatException("Not a number");
 
             return output;
         }
@@ -27,8 +30,11 @@ namespace osu.Game.Beatmaps.Formats
         public static double ParseDouble(string input, double parseLimit = MAX_PARSE_VALUE)
         {
             var output = double.Parse(input, CultureInfo.InvariantCulture);
-            if (output < -parseLimit) throw new FormatException("Value is too low");
-            if (output > parseLimit) throw new FormatException("Value is too high");
+
+            if (output < -parseLimit) throw new OverflowException("Value is too low");
+            if (output > parseLimit) throw new OverflowException("Value is too high");
+
+            if (double.IsNaN(output)) throw new FormatException("Not a number");
 
             return output;
         }
@@ -36,8 +42,9 @@ namespace osu.Game.Beatmaps.Formats
         public static int ParseInt(string input, int parseLimit = (int)MAX_PARSE_VALUE)
         {
             var output = int.Parse(input, CultureInfo.InvariantCulture);
-            if (output < -parseLimit) throw new FormatException("Value is too low");
-            if (output > parseLimit) throw new FormatException("Value is too high");
+
+            if (output < -parseLimit) throw new OverflowException("Value is too low");
+            if (output > parseLimit) throw new OverflowException("Value is too high");
 
             return output;
         }
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 4d36b45989..d738b1028e 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -225,8 +225,12 @@ namespace osu.Game.Rulesets.Objects.Legacy
             }
             catch (FormatException)
             {
-                return null;
             }
+            catch (OverflowException)
+            {
+            }
+
+            return null;
         }
 
         private void readCustomSampleBanks(string str, SampleBankInfo bankInfo)