diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 9f805e69..0592780a 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -339,6 +339,8 @@ If you switch to one of those with the additional autogenerated model entities t
 
 * Support Borderless Fullscreen and Borderless Window modes for Win32 and SDL platforms
 
+* Fixed crash when executing extract_resources.cfg on Linux
+
 [TRENCHBROOMBFG]
 
 * Renamed custom TrenchBroom fork to TrenchBroomBFG
diff --git a/neo/framework/File.cpp b/neo/framework/File.cpp
index 2dbe8611..561aa417 100644
--- a/neo/framework/File.cpp
+++ b/neo/framework/File.cpp
@@ -1406,6 +1406,13 @@ int idFile_Permanent::Write( const void* buffer, int len )
 		return 0;
 	}
 
+	// Chillax
+	if( buf == NULL )
+	{
+		common->Printf( "idFile_Permanent::Write: buffer is null, 0 bytes written to %s\n", name.c_str() );
+		return 0;
+	}
+
 	buf = ( byte* )buffer;
 
 	remaining = len;