When building the parameters: check also for "null"