More failure handling improvements.