Merge "Bail out early in case of error" into jb-mr2-dev