The MetadataMover can be informed if the file removed is a directory by the FileWatcher. It does not need the extra check. Make sure the unit tests are updated as well.