Added explicit check for map save status