Trap more errors