Merge "Make sure non-fatal errors aren't printed."