EA-55292 (NPE fixed)