Fix notice when starting a session. Perform check for session and actual start at same time.
Merge pull request #2539 from dannyvankooten/release/2.1

Fix notice when starting a session. Perform check for session and actual...