Fixed a Null pointer
Fixed an obscure bug related to long running servers