Map null to None since the beginning
Merge pull request #7 from nataren/handle_missing_public_uri

Map null to None since the beginning