Merge "Take care of a couple of exceptions in the process of handling an add flow...