fixed possible NPE
updated ChangeLog