diff --git a/core/src/main/java/org/bitcoinj/wallet/Wallet.java b/core/src/main/java/org/bitcoinj/wallet/Wallet.java
index 8327483d..d817cf78 100644
--- a/core/src/main/java/org/bitcoinj/wallet/Wallet.java
+++ b/core/src/main/java/org/bitcoinj/wallet/Wallet.java
@@ -1173,6 +1173,10 @@ public class Wallet extends BaseTaggableObject
         final ScriptType scriptType = address.getOutputScriptType();
         if (scriptType == ScriptType.P2PKH || scriptType == ScriptType.P2WPKH)
             return isPubKeyHashMine(address.getHash(), scriptType);
+        else if (scriptType == ScriptType.P2SH)
+            return isPayToScriptHashMine(address.getHash());
+        else if (scriptType == ScriptType.P2WSH)
+            return false;
         else
             throw new IllegalArgumentException(address.toString());
     }