Moved around the then/catch handlers in the registration.