Fix short-circuit issue.
Merge pull request #203 from Team-Combat-Wombat/dev-fix-open-session

Fix short-circuit issue.