diff --git a/Source/Engine/Content/Storage/FlaxStorage.cpp b/Source/Engine/Content/Storage/FlaxStorage.cpp
index ca39ebaf9..17cf2d193 100644
--- a/Source/Engine/Content/Storage/FlaxStorage.cpp
+++ b/Source/Engine/Content/Storage/FlaxStorage.cpp
@@ -214,7 +214,10 @@ FlaxStorage::~FlaxStorage()
     Array<FileReadStream*> streams;
     _file.GetValues(streams);
     for (FileReadStream* stream : streams)
-        Delete(stream);
+    {
+        if (stream)
+            Delete(stream);
+    }
 #endif
 }
 
@@ -1341,7 +1344,10 @@ bool FlaxStorage::CloseFileHandles()
     Array<FileReadStream*> streams;
     _file.GetValues(streams);
     for (FileReadStream* stream : streams)
-        Delete(stream);
+    {
+        if (stream)
+            Delete(stream);
+    }
     _file.Clear();
     return false;
 }