Fixed null pointer exceptions#10

snorf wants to merge 3 commits intoforcedotcom:masterforcedotcom/user-access-visualization:masterfrom

snorf:mastersnorf/user-access-visualization:masterCopy head branch name to clipboard