NPE checks properly now.