Merge "Check for null condition in case there is no DPM support."