diff --git a/contracts/programs/contract-reader-interface/src/lib.rs b/contracts/programs/contract-reader-interface/src/lib.rs
index 53a4a114f..43c8dfe60 100644
--- a/contracts/programs/contract-reader-interface/src/lib.rs
+++ b/contracts/programs/contract-reader-interface/src/lib.rs
@@ -109,7 +109,10 @@ pub mod contract_reader_interface {
 
     pub fn store_token_account(ctx: Context<StoreTokenAccount>, test_idx: u64) -> Result<()> {
         let account = ctx.accounts.token_account.to_account_info();
-        require!(!account.data_is_empty(), TokenAccountError::UninitializedTokenAccount);
+        require!(
+            !account.data_is_empty(),
+            TokenAccountError::UninitializedTokenAccount
+        );
 
         let data = &mut ctx.accounts.data;
         data.idx = test_idx;
@@ -117,7 +120,6 @@ pub mod contract_reader_interface {
         data.bump = ctx.bumps.data;
         Ok(())
     }
-    
 }
 
 #[derive(Accounts)]
diff --git a/pkg/solana/chainwriter/chain_writer.go b/pkg/solana/chainwriter/chain_writer.go
index 1180cd42b..fdf374d3a 100644
--- a/pkg/solana/chainwriter/chain_writer.go
+++ b/pkg/solana/chainwriter/chain_writer.go
@@ -296,8 +296,8 @@ func (s *SolanaChainWriterService) SubmitTransaction(ctx context.Context, contra
 
 	if len(methodConfig.ATAs) > 0 {
 		s.lggr.Debugw("Creating ATAs", "contract", contractName, "method", method)
-		createATAInstructions, err := CreateATAs(ctx, args, methodConfig.ATAs, derivedTableMap, s.client, feePayer, s.lggr)
-		if err != nil {
+		createATAInstructions, ataErr := CreateATAs(ctx, args, methodConfig.ATAs, derivedTableMap, s.client, feePayer, s.lggr)
+		if ataErr != nil {
 			return errorWithDebugID(fmt.Errorf("error resolving account addresses: %w", err), debugID)
 		}
 		if err = s.handleATACreation(ctx, createATAInstructions, methodConfig, contractName, method, feePayer); err != nil {