Don't choke on nil values
Merge pull request #366 from theodi/bugfix-dont-choke-on-nil-values

Don't choke on nil values