Merge "Handle the case where no session exists" into oc-dev