diff --git a/artifacts/program_methods/associated_token_account.bin b/artifacts/program_methods/associated_token_account.bin
index 46326067..be94122a 100644
Binary files a/artifacts/program_methods/associated_token_account.bin and b/artifacts/program_methods/associated_token_account.bin differ
diff --git a/integration_tests/tests/token.rs b/integration_tests/tests/token.rs
index eefbff63..f226b52e 100644
--- a/integration_tests/tests/token.rs
+++ b/integration_tests/tests/token.rs
@@ -1165,7 +1165,6 @@ async fn token_claiming_path_with_private_accounts() -> Result<()> {
         amount: mint_amount,
     };
 
-    // This should be the one that breaks? (Marvin)
     wallet::cli::execute_subcommand(ctx.wallet_mut(), Command::Token(subcommand)).await?;
 
     info!("Waiting for next block creation");
diff --git a/wallet/src/cli/keycard.rs b/wallet/src/cli/keycard.rs
index 2efec98a..8dde98e4 100644
--- a/wallet/src/cli/keycard.rs
+++ b/wallet/src/cli/keycard.rs
@@ -30,10 +30,11 @@ impl WalletSubcommand for KeycardSubcommand {
                 Python::with_gil(|py| {
                     python_path::add_python_path(py).expect("keycard_wallet.py not found");
 
-                    let wallet = KeycardWallet::new(py).expect("Expect keycard wallet");
-                    let available = wallet
-                        .is_unpaired_keycard_available(py)
-                        .expect("Expect a Boolean.");
+                    let wallet = KeycardWallet::new(py)
+                        .expect("`wallet::keycard::available`: invalid data received for pin");
+                    let available = wallet.is_unpaired_keycard_available(py).expect(
+                        "`wallet::keycard::available`: received invalid data from Keycard wrapper",
+                    );
 
                     if available {
                         println!("\u{2705} Keycard is available.");
@@ -48,10 +49,14 @@ impl WalletSubcommand for KeycardSubcommand {
                 Python::with_gil(|py| {
                     python_path::add_python_path(py).expect("keycard_wallet.py not found");
 
-                    let wallet = KeycardWallet::new(py).expect("Expect keycard wallet");
+                    let wallet = KeycardWallet::new(py)
+                        .expect("`wallet::keycard::load`: invalid keycard wallet provided");
 
                     let is_connected = wallet
-                        .setup_communication(py, &pin.expect("Expect a pin as a String."))
+                        .setup_communication(
+                            py,
+                            &pin.expect("`wallet::keycard::load`: invalid data received for pin"),
+                        )
                         .expect("Expect a Boolean.");
 
                     if is_connected {
@@ -60,10 +65,14 @@ impl WalletSubcommand for KeycardSubcommand {
                         println!("\u{274c} Keycard is not connected to wallet.");
                     }
 
-                    drop(wallet.load_mnemonic(
-                        py,
-                        &mnemonic.expect("Expect a mnemonic phrase as a string"),
-                    ));
+                    drop(
+                        wallet.load_mnemonic(
+                            py,
+                            &mnemonic.expect(
+                                "E`wallet::keycard::load`: invalid data received for mnemonic",
+                            ),
+                        ),
+                    );
 
                     drop(wallet.disconnect(py));
                 });
diff --git a/wallet/src/cli/programs/native_token_transfer.rs b/wallet/src/cli/programs/native_token_transfer.rs
index 2949e803..f63f8bae 100644
--- a/wallet/src/cli/programs/native_token_transfer.rs
+++ b/wallet/src/cli/programs/native_token_transfer.rs
@@ -167,7 +167,7 @@ impl WalletSubcommand for AuthTransferSubcommand {
                     )?),
                     (None, None, Some(to_key_path)) => {
                         Some(KeycardWallet::get_account_id_for_path_with_connect(
-                            &pin.as_ref().expect("Expect a pin as a String."),
+                            pin.as_ref().expect("`wallet::programs::native_token_transfer::send`: invalid data received for pin"),
                             &to_key_path,
                         ))
                     }
diff --git a/wallet/src/program_facades/native_token_transfer/public.rs b/wallet/src/program_facades/native_token_transfer/public.rs
index 011dfc1e..e7790897 100644
--- a/wallet/src/program_facades/native_token_transfer/public.rs
+++ b/wallet/src/program_facades/native_token_transfer/public.rs
@@ -110,13 +110,13 @@ impl NativeTokenTransfer<'_> {
             WitnessSet::for_message(&message, &[signing_key])
         } else {
             let pub_key = KeycardWallet::get_public_key_for_path_with_connect(
-                pin.as_ref().expect("Expect a pin as a String."),
-                key_path.as_ref().expect("Expect a key path String."),
+                pin.as_ref().expect("`wallet::program_facades::native_token_transfer::public::register_account`: invalid data received for pin for public key"),
+                key_path.as_ref().expect("`wallet::program_facades::native_token_transfer::public::register_account`: invalid data received for key_path for public_key"),
             );
 
             let signature = KeycardWallet::sign_message_for_path_with_connect(
-                pin.as_ref().as_ref().expect("Expect a pin as a String."),
-                key_path.as_ref().expect("Expect a key path String."),
+                pin.as_ref().as_ref().expect("`wallet::program_facades::native_token_transfer::public::register_account`: invalid data received for pin for signature"),
+                key_path.as_ref().expect("`wallet::program_facades::native_token_transfer::public::register_account`: invalid data received for key_path for public_key"),
                 &message.hash_message(),
             )
             .expect("Expect a valid Signature.");