Moved TODO detection outside of just the error block. Logic error. whoops