Rescue this exception only where it's expected
Document new feature in CHANGELOG