Take null into account when building conditions
Merge pull request #61 from madtrick/upstream_master

Take null into account when building conditions