Updated and expanded description of condition handling, including