Bug #190 Properly Account For Error Conditions In Address Change