diff --git a/CSharp/Libraries/UniversalEditor.Essential/ObjectModels/FileSystem/FileSystemObjectModel.cs b/CSharp/Libraries/UniversalEditor.Essential/ObjectModels/FileSystem/FileSystemObjectModel.cs
index f1f78777..91ef7fd3 100644
--- a/CSharp/Libraries/UniversalEditor.Essential/ObjectModels/FileSystem/FileSystemObjectModel.cs
+++ b/CSharp/Libraries/UniversalEditor.Essential/ObjectModels/FileSystem/FileSystemObjectModel.cs
@@ -227,6 +227,7 @@ namespace UniversalEditor.ObjectModels.FileSystem
 		/// <returns></returns>
 		public File AddFile(string name, byte[] fileData = null)
 		{
+			if (name == null) name = String.Empty;
 			string[] path = name.Split(mvarPathSeparators, StringSplitOptions.None);
 			Folder parent = null;
 			for (int i = 0; i < path.Length - 1; i++)