Added a better server start check