Merge pull request #16145 from phoet/patch-2

don't log errors when all is fine