Changes mostly to handling save/load errors