Catch more errors?