Switch from fatal! to raise for [COOK-3805].
Merge branch 'cook-3805' into develop