Also, handle null here.
Merge pull request #17 from fedora-infra/feature/also-null

Also, handle null here.