Merge "Fix preventing error message output"