From 30906b1a1a13a4033e51fb85a657951756d0efd2 Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Mon, 2 Oct 2017 22:06:18 -0700
Subject: [PATCH] htlcswitch: within handleLocalDispatch bubble up the decode
 error

---
 htlcswitch/switch.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htlcswitch/switch.go b/htlcswitch/switch.go
index 6d7948da..b6881f44 100644
--- a/htlcswitch/switch.go
+++ b/htlcswitch/switch.go
@@ -402,7 +402,12 @@ func (s *Switch) handleLocalDispatch(payment *pendingPayment, packet *htlcPacket
 		}
 
 		// Notify user that his payment was discarded.
-		payment.err <- failure
+		if userErr != nil {
+			payment.err <- userErr
+		} else {
+			payment.err <- failure
+		}
+
 		payment.preimage <- zeroPreimage
 		s.removePendingPayment(payment.amount, payment.paymentHash)