Merge pull request #8375 from mollux/CRM-18563_example_exception_inconsistent