Exceptional stuff

Ongoing work to resolve COCAINE-82.