Merge "Fix null pointer when create session"