Move empty/nil checking to the model
Merge pull request #57 from jmazzi/feature/nil_and_empty

Move empty/nil checking to the model