Updated drivers with error checking for class. REG