Merge "Handle the case where no session exists" into oc-dev am: 261dd2305a
am: cd190037af

Change-Id: Ic5271f342f90b5b4d5057bffe38def7a4a107b96