adding check to delegate
reverting a change that broke validation errors