Tweak to get rid of error messages when "same address" option is checked