Gracefully handle invalid sessions (WIP 306)

Addresses the issue describe in [WIP 306](https://assembly.com/coderwall/wips/306)