Fix NPE on /addxp