handle a null object
Merge pull request #4 from andyroyle/handle-null-object

handle a null object