added NPE test and adjusted wording