Only add non-null conditions, which are null when the econdition.@ignore-if-empty attribute is true and the condition value is empty; was throwing an exception for this