Improve failed startup follow-up exceptions and back to OWB snapshot (#1093)

2 files changed