Changed CascadeType of Address in CustomerPayment from .ALL to .MERGE and .PERSIST to prevent it from being deleted when a CustomerPayment record was deleted.