Merge "Fix NPE when session is finished before service replies."