Rename exceptions to something more specific