Fix error tracking
Make device-records consistent with the rest of the imports.