Fixes "java.lang.IllegalArgumentException: session must not be null" Change-Id: Id7e77a44e59e5169ed8944682ab79783631182dd