#92 deal with null params