SDPIV-34 - pending_on and location name changes and SDPIV-35 nil checks