- Added initial exception support