Issue #2156831 by brad.bulger: correctly handle registration failures