4335 pull from staging

Tend to use `exceptions` as a module name. Probably best to stick with convention