bugz 4662: fixed NPE - develop