- Added support to throw exception from internal