Corrected NPE possibilities