InternalError exception now caught (almost) everywhere