GRECLIPSE-1765 Fix to prevent NPE