Fix rare NPE