LPS-48584 Small bugfix for NPE