Bug 21190: (follow-up) Save patron id in failure when available