Not-very-nice fix for an instant-server-crash bug