I would really prefer not to make the change you suggest because it hides the actual problem that bad data is getting passed.