protect against NPE
Merge branch '8.34' of ssh://dasc-git.diamond.ac.uk/gda/gda-core into 8.34