Bug fix. Check for correct filename before trying to remove