Improve handling of journey query error states
On persistent errors we want to discard the transfer element, otherwise we reset to the pending state.