First attempt to allow empty secondary address. Did not succeed in testing this though.
second attempt.