Added initial support for exceptions