squash npe
fix errors resulting from change to CMR API