LPS-45345 Prevent NPE