Added more error checking and recovery for RSVP