Coding more defensively to avoid null exceptions. Fixes #305
Merge branch 'master' of github.com:monarch-initiative/monarch-app
Merge branch 'master' of github.com:monarch-initiative/monarch-app