CC-5709: Even more slightly better exception handling