A few updates to better handle registration errors