Avoid error logging for bad input.

@bug W-1724682@

@rev fabbott@
Merging origin/goliver/master-pending-whack-a-gack into master