BUG-8445: check sessionId before propagating failures

No match.