Add proper None check for None device class
Update bindings