diff --git a/htlcswitch/link.go b/htlcswitch/link.go
index c7a86c1e..3290573a 100644
--- a/htlcswitch/link.go
+++ b/htlcswitch/link.go
@@ -2309,8 +2309,7 @@ func (l *channelLink) HandleSwitchPacket(pkt *htlcPacket) error {
 	l.log.Tracef("received switch packet inkey=%v, outkey=%v",
 		pkt.inKey(), pkt.outKey())
 
-	l.mailBox.AddPacket(pkt)
-	return nil
+	return l.mailBox.AddPacket(pkt)
 }
 
 // HandleChannelUpdate handles the htlc requests as settle/add/fail which sent
diff --git a/htlcswitch/test_utils.go b/htlcswitch/test_utils.go
index c591e65b..614abce6 100644
--- a/htlcswitch/test_utils.go
+++ b/htlcswitch/test_utils.go
@@ -1167,7 +1167,7 @@ func (h *hopNetwork) createChannelLink(server, peer *mockServer,
 			BatchSize:               10,
 			BatchTicker:             ticker.NewForce(testBatchTimeout),
 			FwdPkgGCTicker:          ticker.NewForce(fwdPkgTimeout),
-			PendingCommitTicker:     ticker.NewForce(time.Minute),
+			PendingCommitTicker:     ticker.NewForce(2 * time.Minute),
 			MinFeeUpdateTimeout:     minFeeUpdateTimeout,
 			MaxFeeUpdateTimeout:     maxFeeUpdateTimeout,
 			OnChannelFailure:        func(lnwire.ChannelID, lnwire.ShortChannelID, LinkFailureError) {},