More fixes around engine error management.