Merge "Improve doPrepareInternal error messages"