Merge "Better error message when no UID allocated."