Added guards on rectify driver.