Minor modifications and clarifications of exceptions.