fix MPS-19524 NPE on smart completion
fix MPS-19456: Illegal access on smart completion