Better error handling for save failures