Harden after crash issue with CMS.