fix NPE and user label instead of id