Some better error handling for save errors