diff --git a/src/keymap.rs b/src/keymap.rs
index 448409e4b4e01da11a86a545b0c94953447de2eb..6d215a063ab671108002a54660a4eb6d30a01bdc 100644
--- a/src/keymap.rs
+++ b/src/keymap.rs
@@ -256,6 +256,7 @@ impl EditState {
         }
         let (n, positive) = self.emacs_num_args(); // consume them in all cases
         if let Some(cmd) = self.custom_bindings.borrow().get(&key) {
+            debug!(target: "rustyline", "Custom command: {:?}", cmd);
             return Ok(if cmd.is_repeatable() {
                           cmd.redo(Some(n))
                       } else {
@@ -380,6 +381,7 @@ impl EditState {
         let no_num_args = self.num_args == 0;
         let n = self.vi_num_args(); // consume them in all cases
         if let Some(cmd) = self.custom_bindings.borrow().get(&key) {
+            debug!(target: "rustyline", "Custom command: {:?}", cmd);
             return Ok(if cmd.is_repeatable() {
                           if no_num_args {
                               cmd.redo(None)
@@ -536,6 +538,7 @@ impl EditState {
     fn vi_insert<R: RawReader>(&mut self, rdr: &mut R) -> Result<Cmd> {
         let key = try!(rdr.next_key());
         if let Some(cmd) = self.custom_bindings.borrow().get(&key) {
+            debug!(target: "rustyline", "Custom command: {:?}", cmd);
             return Ok(if cmd.is_repeatable() {
                           cmd.redo(None)
                       } else {
diff --git a/src/lib.rs b/src/lib.rs
index 883f086e9632b62986eb4e8ef5f446d6618ff7fd..27e246bd2563cdd8665716c3e3a91d38bb31ba3c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -566,17 +566,12 @@ fn edit_history_next(s: &mut State, history: &History, prev: bool) -> Result<()>
 
 fn edit_history_search(s: &mut State, history: &History, dir: Direction) -> Result<()> {
     if history.is_empty() {
-        return Ok(());
+        return beep();
     }
-    if s.history_index == history.len() {
-        if dir == Direction::Reverse {
-            // Save the current edited line before to overwrite it
-            s.snapshot();
-        } else {
-            return Ok(());
-        }
+    if s.history_index == history.len() && dir == Direction::Forward {
+        return beep();
     } else if s.history_index == 0 && dir == Direction::Reverse {
-        return Ok(());
+        return beep();
     }
     if dir == Direction::Reverse {
         s.history_index -= 1;
@@ -590,7 +585,7 @@ fn edit_history_search(s: &mut State, history: &History, dir: Direction) -> Resu
         s.line.update(buf, buf.len());
         s.refresh_line()
     } else {
-        Ok(())
+        beep()
     }
 }