rhbz1026155 - fix NPE