LPS-46629 protect against NPE