Smarter handling of null data, so there aren't ?null requests