APOLLO-4046 Avoiding throwing an exception when the address is assigned to the original owner;
Merge pull request #123 from ministryofjustice/APOLLO-4046

APOLLO-4046 Avoiding throwing an exception when the address is assigned ...