Added initial exception rethrow section