Exception internalization
Change from previous commit (forget to ctrl+s)