Make sure thrown exceptions are actually Errors (incoming-pr branch)