diff --git a/global-functions.rsc b/global-functions.rsc
index 204f824..221b1b5 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1054,12 +1054,12 @@
 
   $LogPrint debug $0 ("Removing file: ". $FileName);
 
-  :if ([ :len [ /file/find where name=$FileName type!=file ] ] > 0) do={
+  :if ([ :len [ /file/find where name=$FileName (type=directory or type=disk) ] ] > 0) do={
     $LogPrint error $0 ("File '" . $FileName . "' is not a file.");
     :return false;
   }
 
-  :local File [ /file/find where name=$FileName type=file ];
+  :local File [ /file/find where name=$FileName !(type=directory or type=disk) ];
   :if ([ :len $File ] = 0) do={
     $LogPrint debug $0 ("... which does not exist.");
     :return true;