clean up lots of places where exceptions are being raised to reduce the message building overhead