diff --git a/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.cpp b/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.cpp
index 1c99bd5..6250a84 100644
--- a/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.cpp
+++ b/openVulkanoCpp/IO/Archive/MultiPartArchiveWriter.cpp
@@ -44,7 +44,7 @@ namespace openVulkanoCpp
 
 	void MultiPartArchiveWriter::CheckSize(size_t size)
 	{
-		if (m_fileSizeLimit < m_writer->GetTotalWrittenBytes() + size)
+		if (!m_writer || m_fileSizeLimit < m_writer->GetTotalWrittenBytes() + size)
 		{
 			StartNewFile();
 		}
@@ -105,6 +105,6 @@ namespace openVulkanoCpp
 	void MultiPartArchiveWriter::Split()
 	{
 		if (!m_writer->GetTotalWrittenBytes()) return; // Nothing has been written yet, no need to split file
-		StartNewFile();
+		m_writer = nullptr;
 	}
 }