revert to previous error logic