Merge branch 'hotfix/bug_fix'
fix null pointer where session was not setup ahead of time
Merge branch 'hotfix/bug_fix' into develop