More gracefully handle recoverable save errors

Big thanks to @adib for helping me hunt this one down