Fixed an improper handling of null parameters.