I was just keeping the same error semantics as before. I can remove this.