Cleaning up errors caused by cleaning up