fix null server crashes