Put a try/catch around savefile flushing on shutdown (#1569)

Put a try/catch around savefile flushing on shutdown (#1569) #3623