[ros-diffs] [weiden] 14316: only return the token handle if creating it succeeded