some more defensive checking
Merge branch 'master' of github.com:monarch-initiative/monarch-app
Merge branch 'master' of github.com:monarch-initiative/monarch-app
Merge branch 'master' of github.com:monarch-initiative/monarch-app
addresses #291, and will incidentally address #354