diff --git a/SzCli/LocalFileManager.cs b/SzCli/LocalFileManager.cs
index f0c7d24..b08c602 100644
--- a/SzCli/LocalFileManager.cs
+++ b/SzCli/LocalFileManager.cs
@@ -48,7 +48,7 @@ public class LocalFileManager : ISzFileManager
         }
         catch (Exception e)
         {
-            Console.WriteLine($"Error saving file: {e.Message}");
+            Console.WriteLine($"Error loading file: {e.Message}");
             return null; 
         }
     }
diff --git a/SzLib/SzParser.cs b/SzLib/SzParser.cs
index b0642df..3745be9 100644
--- a/SzLib/SzParser.cs
+++ b/SzLib/SzParser.cs
@@ -35,12 +35,10 @@ public class SzParser(ISzFileManager szFileManager)
 
     public bool SaveDataset(SzDataset dataset)
     {
-        var datasetDir = Path.Combine(szFileManager.DatasetsPath, dataset.Id);
-
+        var datasetPath = Path.Combine(szFileManager.DatasetsPath, dataset.Id, "dataset.json");
         try
         {
-            var json = SerializeDatasetToJson(dataset);
-            return szFileManager.SaveFile(Path.Combine(datasetDir, "dataset.json"), json);
+            return szFileManager.SaveFile(datasetPath, SerializeDatasetToJson(dataset));
         }
         catch (Exception e)
         {
@@ -52,21 +50,8 @@ public class SzParser(ISzFileManager szFileManager)
     public SzDataset? LoadDataset(string datasetId)
     {
         var datasetPath = Path.Combine(szFileManager.DataPath, "datasets", datasetId, "dataset.json");
-        if (!File.Exists(datasetPath))
-        {
-            Console.WriteLine("Dataset not found: " + datasetId);
-            return null;
-        }
-
-        try
-        {
-            return DeserializeDataset(File.ReadAllText(datasetPath));
-        }
-        catch (Exception e)
-        {
-            Console.WriteLine($"Error loading dataset: {e.Message}");
-            return null;
-        }
+        var json = szFileManager.LoadFile(datasetPath);
+        return json is null ? null : DeserializeDataset(json);
     }
 }