Adding a few length checks on calls