First cut of changes to utilize the new exception handling model