Fixed a little more of the new exception class