diff --git a/src/fileEngine.zig b/src/fileEngine.zig
index b36c904..e722b7a 100644
--- a/src/fileEngine.zig
+++ b/src/fileEngine.zig
@@ -200,11 +200,11 @@ pub const FileEngine = struct {
 
         // Deinit the struct array before creating a new one
         for (self.struct_array) |*elem| elem.deinit();
-        self.allocator(self.struct_array);
+        self.allocator.free(self.struct_array);
 
         var struct_array = std.ArrayList(SchemaStruct).init(self.allocator);
         parser.parse(&struct_array) catch return error.SchemaNotConform;
-        self.struct_array = struct_array.toOwnedSlice();
+        self.struct_array = struct_array.toOwnedSlice() catch return FileEngineError.MemoryError;
 
         const path = std.fmt.allocPrint(self.allocator, "{s}/DATA", .{self.path_to_ZipponDB_dir}) catch return FileEngineError.MemoryError;
         defer self.allocator.free(path);
diff --git a/src/main.zig b/src/main.zig
index d910e08..7474b45 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -174,7 +174,7 @@ pub fn main() !void {
                 .expect_path_to_new_db => switch (token.tag) {
                     .identifier => {
                         file_engine.deinit();
-                        file_engine = FileEngine.init(allocator, try allocator.dupe(u8, toker.getTokenSlice(token)));
+                        file_engine = try FileEngine.init(allocator, try allocator.dupe(u8, toker.getTokenSlice(token)));
                         file_engine.checkAndCreateDirectories() catch |err| {
                             send("Error: Coulnt create database directories: {any}", .{err});
                             state = .end;