diff --git a/android/walletlib/src/main/java/com/solana/mobilewalletadapter/walletlib/protocol/MobileWalletAdapterServer.java b/android/walletlib/src/main/java/com/solana/mobilewalletadapter/walletlib/protocol/MobileWalletAdapterServer.java
index 82c9876e5..30fce2be9 100644
--- a/android/walletlib/src/main/java/com/solana/mobilewalletadapter/walletlib/protocol/MobileWalletAdapterServer.java
+++ b/android/walletlib/src/main/java/com/solana/mobilewalletadapter/walletlib/protocol/MobileWalletAdapterServer.java
@@ -327,7 +327,8 @@ private void handleAuthorize(@Nullable Object id, @Nullable Object params) throw
         final String cluster = o.optString(ProtocolContract.PARAMETER_CLUSTER);
         final String chainParam = o.optString(ProtocolContract.PARAMETER_CHAIN);
         final String chain = !chainParam.isEmpty() ? chainParam
-                : !cluster.isEmpty() ? Identifier.clusterToChainIdentifier(cluster) : null;
+                : !cluster.isEmpty() ? Identifier.clusterToChainIdentifier(cluster)
+                : ProtocolContract.CHAIN_SOLANA_MAINNET;
 
         final String authTokenParam = o.optString(ProtocolContract.PARAMETER_AUTH_TOKEN);
         final String authToken = authTokenParam.isEmpty() ? null : authTokenParam;
diff --git a/android/walletlib/src/main/java/com/solana/mobilewalletadapter/walletlib/scenario/LocalScenario.java b/android/walletlib/src/main/java/com/solana/mobilewalletadapter/walletlib/scenario/LocalScenario.java
index 67e4dc448..53785cd14 100644
--- a/android/walletlib/src/main/java/com/solana/mobilewalletadapter/walletlib/scenario/LocalScenario.java
+++ b/android/walletlib/src/main/java/com/solana/mobilewalletadapter/walletlib/scenario/LocalScenario.java
@@ -105,6 +105,7 @@ public byte[] getAssociationPublicKey() {
     }
 
     @Override
+    @NonNull
     public List<SessionProperties.ProtocolVersion> getAssociationProtocolVersions() {
         return associationProtocolVersions;
     }