GDM-67: fix nullpointer