Rescue more errors