Added check on which server run validation