diff --git a/chancloser.go b/chancloser.go
index 903d1fa9c..a0da1c52a 100644
--- a/chancloser.go
+++ b/chancloser.go
@@ -436,7 +436,7 @@ func (c *channelCloser) ProcessCloseMsg(msg lnwire.Message) ([]lnwire.Message, b
 		if err := c.cfg.broadcastTx(closeTx); err != nil {
 			return nil, false, err
 		}
-		if c.cfg.channel.MarkCommitmentBroadcasted(); err != nil {
+		if err := c.cfg.channel.MarkCommitmentBroadcasted(); err != nil {
 			return nil, false, err
 		}
 
diff --git a/rpcserver.go b/rpcserver.go
index 4cacd1062..f1037e4a6 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -4707,7 +4707,7 @@ func (r *rpcServer) FeeReport(ctx context.Context,
 	// Before we perform the queries below, we'll instruct the switch to
 	// flush any pending events to disk. This ensure we get a complete
 	// snapshot at this particular time.
-	if r.server.htlcSwitch.FlushForwardingEvents(); err != nil {
+	if err := r.server.htlcSwitch.FlushForwardingEvents(); err != nil {
 		return nil, fmt.Errorf("unable to flush forwarding "+
 			"events: %v", err)
 	}