NPEs must die!

Closes #927