Catch more errors