Loosen up requirements around exception consistency #313
Refactor to use a centralized function to assert exceptions for concistency. #313