MPS-19182
fix NPE when try to reproduce MPS-18660
fix NPE when investigate MPS-18527