prevent NPE
rmeove compiler warning and add some comments
Merge branch '8.36' of ssh://dascgitolite@dasc-git.diamond.ac.uk/gda/gda-core.git into 8.36