Added protection around server startup