The following patch fixes the build for those platforms that do not have CD support (ie, are using null support)