Updated CHANGELOG
Fixed NPE