added missing annotations and null checks for user service