FEND-867 check for null
Merge branch 'master' into jan_r2
adding unit test for FEND-867
Merge branch 'jan_r2' of https://github.com/PLOS/ambra into jan_r2