add in null check for downgrading 1.2rc_1