Prevent the creatino of empty checks

Closes #151
Merge pull request #154 from fzaninotto/prevent_empty_check

Prevent the creation of empty checks