CHANGE: Some small exception changes.