Added checks for null values.
Merge branch '1.1.x-bugfix-branch' of github.com:ukwa/warc-discovery into 1.1.x-bugfix-branch