LPS-41972 Update properties
SOS-1411 Fix NPE