Throws NPE on null in addContactPoint (JAVA-291)