diff --git a/consensus/state.go b/consensus/state.go
index ee566469f..bff351aa9 100644
--- a/consensus/state.go
+++ b/consensus/state.go
@@ -1196,6 +1196,7 @@ func (cs *ConsensusState) tryFinalizeCommit(height int) {
 	}
 	if !cs.ProposalBlock.HashesTo(hash) {
 		// TODO: this happens every time if we're not a validator (ugly logs)
+		// TODO: ^^ wait, why does it matter that we're a validator?
 		log.Warn("Attempt to finalize failed. We don't have the commit block.")
 		return
 	}
diff --git a/mempool/reactor.go b/mempool/reactor.go
index 9e2888b1b..626315de9 100644
--- a/mempool/reactor.go
+++ b/mempool/reactor.go
@@ -109,7 +109,7 @@ func (memR *MempoolReactor) broadcastTxRoutine(peer Peer) {
 
 	var next *clist.CElement
 	for {
-		if !memR.IsRunning() {
+		if !memR.IsRunning() || !peer.IsRunning() {
 			return // Quit!
 		}
 		if next == nil {