More idiomatic ways of handling nil
Merge pull request #1 from asterite/master

More idiomatic ways of handling nil