Rework error management to add an exception safe ... exception.