LPS-37530 Fix NPE (Push to master)