Fixed #169 - Server crash

You talk as though there are 2 paths where we delete this, depending on whether it's used or not.  Where is the other path?  I see no other code that does a delete.