[TDI-30477] Remove die on error field