1 files changed, 11 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/smartcard/UsbTransport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/smartcard/UsbTransport.java
index 43496b31c..8d661b9fa 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/smartcard/UsbTransport.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/smartcard/UsbTransport.java
@@ -130,9 +130,13 @@ public class UsbTransport implements Transport {
      */
     @Override
     public void release() {
-        mConnection.releaseInterface(mUsbInterface);
-        mConnection.close();
-        mConnection = null;
+        if (mConnection != null) {
+            mConnection.releaseInterface(mUsbInterface);
+            mConnection.close();
+            mConnection = null;
+        }
+
+        Log.d(Constants.TAG, "Usb transport disconnected");
     }
 
     /**
@@ -292,4 +296,8 @@ public class UsbTransport implements Transport {
     public int hashCode() {
         return mUsbDevice != null ? mUsbDevice.hashCode() : 0;
     }
+
+    public UsbDevice getUsbDevice() {
+        return mUsbDevice;
+    }
 }