Fixed issue #17 - no longer crashes on session tab.
Merge branch 'bugfix-issue-17' into develop