Fixed #169 - Server crash

Brilliant.