Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1