add extra checking around null calibration values