Two NPE: corrected