Fix some issues with the logic on the exceptions block