diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
index 481df90..4dfb332 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
@@ -699,7 +699,7 @@ public class WalletActivity extends AppCompatActivity implements WalletFragment.
             amount = Wallet.getAmountFromString(amountString);
         }
         if ((paymentId != null) && !Wallet.isPaymentIdValid(paymentId)) {
-            address = null;
+            return null;
         }
 
         if (Wallet.isAddressValid(address, WalletManager.getInstance().isTestNet())) {
@@ -757,4 +757,4 @@ public class WalletActivity extends AppCompatActivity implements WalletFragment.
     public void onExchange(AsyncExchangeRate.Listener listener, String currencyA, String currencyB) {
         new AsyncExchangeRate(listener).execute(currencyA, currencyB);
     }
-}
\ No newline at end of file
+}