Add fix for NPE if DataCollector has not been configured.
Bump version.
Fix possible NPE.