Tweak crash prevention and revert update of FCModel.