CEDEX-5383: Updates for runtime NPE exceptions