fix MPS-17655 NPE
fix MPS-17655 NPE