Reworking run loop logic to be more forgiving to the server