NPEs were actually a different bug, so separating these.