diff --git a/chooseui/chooseui.go b/chooseui/chooseui.go
index 6db5b5a..72d8db0 100644
--- a/chooseui/chooseui.go
+++ b/chooseui/chooseui.go
@@ -38,7 +38,7 @@ func New(choices []string) *ChooseUI {
 	return &ChooseUI{Choices: choices}
 }
 
-// Choose launches our user interface.
+// SetupUI configures the UI.
 func (ui *ChooseUI) SetupUI() {
 
 	//
@@ -125,6 +125,7 @@ func (ui *ChooseUI) SetupUI() {
 
 }
 
+// SetupKeyBinding installs the global captures, and list-specific keybindings.
 func (ui *ChooseUI) SetupKeyBinding() {
 
 	//
diff --git a/cmd_feeds.go b/cmd_feeds.go
index e85e460..e889655 100644
--- a/cmd_feeds.go
+++ b/cmd_feeds.go
@@ -60,10 +60,17 @@ func (t *feedsCommand) FindFeeds(base string) ([]string, error) {
 	// Use the parser to get the links
 	ret, err = t.runparser(z, base)
 
-	// Nothing found?
+	// Error? Return that.
+	if err != nil {
+		return ret, err
+	}
+
+	// No feed-links?  Then return the error-sentinel.
 	if len(ret) == 0 {
 		return ret, ErrNoFeeds
 	}
+
+	// All good
 	return ret, nil
 }