bugz 4662: fixed NPE - 2014.05