Added null check on AddressingProperties