Joe Girardi is hopeful that New York Yankees closer Mariano Rivera will not retire at the end of the year and return for one more season.