Add server checks in start and stop