Don't resolve 'not-current' errors in catch
Use whileValid to bail early when input changes