Update error handling on run