Rescue errors and update credits