LPS-42961 Set default values if properties are null or empty