Made it less pron to erroring out upon server death.