diff --git a/app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java b/app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java
index cac8abf..cac7ece 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java
@@ -183,7 +183,11 @@ public class WalletManager {
 
     public Wallet.Device queryWalletDevice(String keys_file_name, String password) {
         int device = queryWalletDeviceJ(keys_file_name, password);
-        return Wallet.Device.values()[device + 1]; // mapping is monero+1=android
+        Wallet.Device[] types = Wallet.Device.values();
+        // mapping is monero+1=android
+        if ((device < 0) || (device > types.length - 2))
+            device = -1;
+        return types[device + 1];
     }
 
     private native int queryWalletDeviceJ(String keys_file_name, String password);