Moved gatherer validation to allow dashboard shutdown