first attempt to squash session errors
Merge pull request #135 from milsyobtaf/master

First attempt to squash session errors