#1261: Better handling of files with the same name.
#1261: Handle case where file to be moved isn't found.