Merge "Fix KeyError in exception message of manager"