Added nullsafe argument escaping