Fixed some exceptions for second device registration.