Fixing double standard with nil handling.
Merge pull request #7 from clowder/double-standard-with-nil

Fixing double standard with nil handling.