Don't ignore return in if else
Added support for ifnull and ifnonull