Safe dictionary gets
Merge pull request #5077 from dimagi/no-username

Safe dictionary gets