Avoid adding empty conditions