Temp NPE protection