Bug/4358 unhandled error during register

Handle Timeout errors during register.
[Closes #4358]