JR1047 avoid NPE