fixes #234 - Server Crash on Wake