Merge "Fix build issue with new error checks." into jb-mr1-dev