Add null condition, remove condition from price=0

-