NX-493: NPE guard