Fixed #169 - Server crash

What about this?  Using the word `session` here is probably not right anymore?  Also, passing sessionId?