@jhudson8 @kpdecker 
Do we really want to do for both? I would think we only want this behavior for `invalid` and not `error`?