Fix occasional server crash;