Fixed Exception scope