diff --git a/CSharp/Libraries/UniversalEditor.Core/DataFormat.cs b/CSharp/Libraries/UniversalEditor.Core/DataFormat.cs
index 99ad104b..64df7b16 100644
--- a/CSharp/Libraries/UniversalEditor.Core/DataFormat.cs
+++ b/CSharp/Libraries/UniversalEditor.Core/DataFormat.cs
@@ -278,10 +278,8 @@ namespace UniversalEditor
 		}
 		public bool MatchesFile(string FileName, System.IO.Stream FileData)
 		{
-			if (FileName != null)
-			{
-				FileName = System.IO.Path.GetFileName(FileName);
-			}
+			if (FileName == null) return false;
+			if (System.IO.File.Exists(FileName)) FileName = System.IO.Path.GetFileName(FileName);
 
 			switch (mvarHintComparison)
 			{