diff --git a/osu!StreamCompanion/Code/Core/SqliteConnector.cs b/osu!StreamCompanion/Code/Core/SqliteConnector.cs
index ad49d96b..15d19344 100644
--- a/osu!StreamCompanion/Code/Core/SqliteConnector.cs
+++ b/osu!StreamCompanion/Code/Core/SqliteConnector.cs
@@ -223,14 +223,14 @@ private void FillBeatmapParameters(Beatmap beatmap)
 
         }
         public Beatmap GetBeatmap(int mapId)
-        {//mapId should be >0
-
+        {
             string sql = "SELECT * FROM `withID` WHERE MapId = " + mapId;
             var reader = Query(sql);
-            var beatmap = new Beatmap();
+            Beatmap beatmap = null;
 
             if (reader.Read())
             {
+                beatmap = new Beatmap();
                 beatmap.Read(reader);
             }
             else
@@ -238,10 +238,10 @@ public Beatmap GetBeatmap(int mapId)
                 reader.Dispose();
                 sql = "SELECT * FROM `Temp` WHERE MapId = " + mapId;
                 reader = Query(sql);
-                beatmap = new Beatmap();
 
                 if (reader.Read())
                 {
+                    beatmap = new Beatmap();
                     beatmap.Read(reader);
                 }
                 reader.Dispose();
diff --git a/osu!StreamCompanion/Code/Core/SqliteControler.cs b/osu!StreamCompanion/Code/Core/SqliteControler.cs
index ef893e57..39940e5a 100644
--- a/osu!StreamCompanion/Code/Core/SqliteControler.cs
+++ b/osu!StreamCompanion/Code/Core/SqliteControler.cs
@@ -103,7 +103,7 @@ public void StoreTempBeatmap(Beatmap beatmap)
         /// 
         /// </summary>
         /// <param name="mapId"></param>
-        /// <returns>Beatmap object with filled or not map data (use mapId property as check if data is set)</returns>
+        /// <returns>Beatmap object with data, or null on not found</returns>
         public Beatmap GetBeatmap(int mapId)
         {
             lock (_sqlConnector)