diff --git a/cmd/zetae2e/run.go b/cmd/zetae2e/run.go
index fe28c4e0ce..91116f234c 100644
--- a/cmd/zetae2e/run.go
+++ b/cmd/zetae2e/run.go
@@ -124,7 +124,7 @@ func runE2ETest(cmd *cobra.Command, args []string) error {
 			conf.ZetaChainID,
 		)
 		if err != nil {
-			return nil
+			return err
 		}
 		runnerOpts = append(runnerOpts, runner.WithZetaTxServer(zetaTxServer))
 	}
diff --git a/zetaclient/chains/evm/observer/inbound.go b/zetaclient/chains/evm/observer/inbound.go
index d5ecdac7b1..d7632ac192 100644
--- a/zetaclient/chains/evm/observer/inbound.go
+++ b/zetaclient/chains/evm/observer/inbound.go
@@ -147,7 +147,10 @@ func (ob *Observer) ProcessInboundTrackers(ctx context.Context) error {
 
 		// if the transaction is sent to the gateway, this is a v2 inbound
 		gatewayAddr, gateway, err := ob.GetGatewayContract()
-		if err == nil && ethcommon.HexToAddress(tx.To) == gatewayAddr {
+		if err != nil {
+			ob.Logger().Inbound.Debug().Err(err).Msg("error getting gateway contract for processing inbound tracker")
+		}
+		if err == nil && tx != nil && ethcommon.HexToAddress(tx.To) == gatewayAddr {
 			if err := ob.ProcessInboundTrackerV2(ctx, gateway, tx, receipt); err != nil {
 				return err
 			}
diff --git a/zetaclient/chains/evm/observer/v2_tracker.go b/zetaclient/chains/evm/observer/v2_inbound_tracker.go
similarity index 100%
rename from zetaclient/chains/evm/observer/v2_tracker.go
rename to zetaclient/chains/evm/observer/v2_inbound_tracker.go