Merge pull request #3 from crain/develop

Add null checks for tenant identifier