Minor fix ups, to make last resort error handling work appropriately.