Clarify/improve handling of null parameters