Impove client checking