CEDEX-5383: more updates for runtime NPE exceptions