VIVO-503 add a null pointer check
Merge branch 'maint-rel-1.6' into develop