diff --git a/src/components/GenuineCheck.js b/src/components/GenuineCheck.js
index b96fee29..50cb9d28 100644
--- a/src/components/GenuineCheck.js
+++ b/src/components/GenuineCheck.js
@@ -85,7 +85,7 @@ class GenuineCheck extends PureComponent<Props> {
       .toPromise()
     const isGenuine = res === '0000'
     if (!isGenuine) {
-      return Promise.reject(new Error('Device not genuine')) // TODO: use custom error class
+      return Promise.reject(new DeviceNotGenuineError())
     }
     setDeviceGenuinity(device, true)
     return Promise.resolve(true)
@@ -142,11 +142,11 @@ class GenuineCheck extends PureComponent<Props> {
 
     return (
       <DeviceInteraction
+        {...props}
         waitBeforeSuccess={500}
         steps={steps}
         onSuccess={onSuccess}
         onFail={this.handleFail}
-        {...props}
       />
     )
   }