Fix handling of null objects
Merge pull request #288 from sharwell/HandleNullDetails

Fix handling of null objects