Added save option on fail