diff --git a/OsuParsers/Decoders/BeatmapDecoder.cs b/OsuParsers/Decoders/BeatmapDecoder.cs
index 38d4e6b..b786736 100644
--- a/OsuParsers/Decoders/BeatmapDecoder.cs
+++ b/OsuParsers/Decoders/BeatmapDecoder.cs
@@ -29,10 +29,7 @@ public static class BeatmapDecoder
         /// <returns>A usable beatmap.</returns>
         public static Beatmap Decode(string path)
         {
-            if (File.Exists(path))
-                return Decode(File.ReadAllLines(path));
-            else
-                throw new FileNotFoundException();
+            return Decode(File.ReadAllLines(path));
         }
 
         /// <summary>
diff --git a/OsuParsers/Decoders/DatabaseDecoder.cs b/OsuParsers/Decoders/DatabaseDecoder.cs
index eb5a5c7..6e09b3b 100644
--- a/OsuParsers/Decoders/DatabaseDecoder.cs
+++ b/OsuParsers/Decoders/DatabaseDecoder.cs
@@ -18,10 +18,10 @@ public static class DatabaseDecoder
         /// <returns>A usable <see cref="OsuDatabase"/>.</returns>
         public static OsuDatabase DecodeOsu(string path)
         {
-            if (TryOpenReadFile(path, out var stream))
+            using (var stream = new FileStream(path, FileMode.Open)) 
+            { 
                 return DecodeOsu(stream);
-            else
-                throw new FileNotFoundException();
+            }
         }
 
         /// <summary>
@@ -137,10 +137,10 @@ public static OsuDatabase DecodeOsu(Stream stream)
         /// <returns>A usable <see cref="CollectionDatabase"/>.</returns>
         public static CollectionDatabase DecodeCollection(string path)
         {
-            if (TryOpenReadFile(path, out var stream))
+            using (var stream = File.OpenRead(path)) 
+            {
                 return DecodeCollection(stream);
-            else
-                throw new FileNotFoundException();
+            }
         }
 
         /// <summary>
@@ -182,10 +182,10 @@ public static CollectionDatabase DecodeCollection(Stream stream)
         /// <returns>A usable <see cref="ScoresDatabase"/>.</returns>
         public static ScoresDatabase DecodeScores(string path)
         {
-            if (TryOpenReadFile(path, out var stream))
+            using (var stream = File.OpenRead(path))
+            {
                 return DecodeScores(stream);
-            else
-                throw new FileNotFoundException();
+            }
         }
 
         /// <summary>
@@ -246,10 +246,10 @@ public static ScoresDatabase DecodeScores(Stream stream)
         /// <returns>A usable <see cref="PresenceDatabase"/>.</returns>
         public static PresenceDatabase DecodePresence(string path)
         {
-            if (TryOpenReadFile(path, out var stream))
+            using (var stream = File.OpenRead(path))
+            {
                 return DecodePresence(stream);
-            else
-                throw new FileNotFoundException();
+            }
         }
 
         /// <summary>
@@ -285,21 +285,5 @@ public static PresenceDatabase DecodePresence(Stream stream)
 
             return db;
         }
-
-        // Tools
-
-        private static bool TryOpenReadFile(string path, out Stream stream)
-        {
-            if (File.Exists(path))
-            {
-                stream = new FileStream(path, FileMode.Open);
-                return true;
-            }
-            else
-            {
-                stream = null;
-                return false;
-            }
-        }
     }
 }
diff --git a/OsuParsers/Decoders/ReplayDecoder.cs b/OsuParsers/Decoders/ReplayDecoder.cs
index 4572a64..9c87f7f 100644
--- a/OsuParsers/Decoders/ReplayDecoder.cs
+++ b/OsuParsers/Decoders/ReplayDecoder.cs
@@ -21,10 +21,10 @@ public static class ReplayDecoder
         /// <returns>A usable <see cref="Replay"/>.</returns>
         public static Replay Decode(string path)
         {
-            if (File.Exists(path))
-                return Decode(new FileStream(path, FileMode.Open));
-            else
-                throw new FileNotFoundException();
+            using(var stream = File.OpenRead(path)) 
+            {
+                return Decode(stream);
+            }
         }
 
         /// <summary>
diff --git a/OsuParsers/Decoders/StoryboardDecoder.cs b/OsuParsers/Decoders/StoryboardDecoder.cs
index 423bf4e..6025062 100644
--- a/OsuParsers/Decoders/StoryboardDecoder.cs
+++ b/OsuParsers/Decoders/StoryboardDecoder.cs
@@ -26,10 +26,7 @@ public static class StoryboardDecoder
         /// <returns>A usable storyboard.</returns>
         public static Storyboard Decode(string path)
         {
-            if (File.Exists(path))
-                return Decode(File.ReadAllLines(path));
-            else
-                throw new FileNotFoundException();
+            return Decode(File.ReadAllLines(path));
         }
 
         /// <summary>