diff --git a/htlcswitch/switch.go b/htlcswitch/switch.go
index 2e5248a41..66283d8bc 100644
--- a/htlcswitch/switch.go
+++ b/htlcswitch/switch.go
@@ -55,6 +55,10 @@ var (
 	// request.
 	ErrSwitchExiting = errors.New("htlcswitch shutting down")
 
+	// ErrNoLinksFound is an error returned when we attempt to retrieve the
+	// active links in the switch for a specific destination.
+	ErrNoLinksFound = errors.New("no channel links found")
+
 	// zeroPreimage is the empty preimage which is returned when we have
 	// some errors.
 	zeroPreimage [sha256.Size]byte
@@ -2105,8 +2109,7 @@ func (s *Switch) GetLinksByInterface(hop [33]byte) ([]ChannelLink, error) {
 func (s *Switch) getLinks(destination [33]byte) ([]ChannelLink, error) {
 	links, ok := s.interfaceIndex[destination]
 	if !ok {
-		return nil, fmt.Errorf("unable to locate channel link by "+
-			"destination hop id %x", destination)
+		return nil, ErrNoLinksFound
 	}
 
 	channelLinks := make([]ChannelLink, 0, len(links))
diff --git a/server.go b/server.go
index 9bd996f5a..3ed068387 100644
--- a/server.go
+++ b/server.go
@@ -2449,8 +2449,9 @@ func (s *server) peerTerminationWatcher(p *peer, ready chan struct{}) {
 	//
 	// TODO(roasbeef): instead add a PurgeInterfaceLinks function?
 	links, err := p.server.htlcSwitch.GetLinksByInterface(p.pubKeyBytes)
-	if err != nil {
-		srvrLog.Errorf("unable to get channel links: %v", err)
+	if err != nil && err != htlcswitch.ErrNoLinksFound {
+		srvrLog.Errorf("Unable to get channel links for %x: %v",
+			p.pubKeyBytes, err)
 	}
 
 	for _, link := range links {