Fix dependency and NPE bug in CDO for Eclipse 4.4