Tweak so that we don't constantly generate error messages