Check for existence of a directory to remove before attempting to do so

Check for existence of a directory to remove before attempting to do so #2122