diff --git a/Lib/pdb.py b/Lib/pdb.py
index b4a19e41312..80cba9d36c4 100755
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -805,6 +805,8 @@ def do_condition(self, arg):
             cond = None
         try:
             bp = self.get_bpbynumber(args[0].strip())
+        except IndexError:
+            self.error('Breakpoint number expected')
         except ValueError as err:
             self.error(err)
         else:
@@ -832,6 +834,8 @@ def do_ignore(self, arg):
             count = 0
         try:
             bp = self.get_bpbynumber(args[0].strip())
+        except IndexError:
+            self.error('Breakpoint number expected')
         except ValueError as err:
             self.error(err)
         else: