Stupid null items

Someone should be shot
Merge pull request #545 from hilburn/master

Stupid null items