diff --git a/debian/changelog b/debian/changelog
index 385be90..9435e91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ubuntu-dev-tools (0.37ubuntu1) intrepid; urgency=low
   [ Jonathan Patrick Davies ]
   * get-branches: Open the teams code page before making a new directory.
   * doc/get-branches.1: Created.
+  * hugdaylist: Improved argument and error handling.
 
  -- Jonathan Patrick Davies <jpds@ubuntu.com> Sun, 10 August 2008 22:07:58 +0100
 
diff --git a/hugdaylist b/hugdaylist
index a274ad0..aae8bc3 100755
--- a/hugdaylist
+++ b/hugdaylist
@@ -50,6 +50,7 @@ def check_args():
     # Our usage options.
     usage = "usage: %prog [-n <number>] launchpad-buglist-url"
     optParser = OptionParser(usage)
+    argsParsed = 0
 
     # Options - namely just the number of bugs to output.
     optParser.add_option("-n", "--number", action = "store_true",
@@ -57,11 +58,14 @@ def check_args():
 
     # Parse arguments.
     (options, args) = optParser.parse_args()
+    print options
+    print args
     
     # Check if we want a number other than the default.
     if options.number:
         try:
-            howmany = int(args[0])
+            howmany = int(args[argsParsed])
+            argsParsed += 1
         except:
             print >> sys.stderr, "Option '-n' requires an integer for an " \
                 "argument."
@@ -75,7 +79,7 @@ def check_args():
         optParser.print_help()
         sys.exit(1)
     else:
-        url = args[0]
+        url = args[argsParsed]
 
     return (howmany, url)
 
@@ -92,8 +96,13 @@ def filter_unsolved(b):
 
 def main(): 
     (howmany, url) = check_args()
-    
-    bl = BugList(url)
+   
+    try:
+        bl = BugList(url)
+    except:
+        print >> sys.stderr, "The page '%s' does not appear to exist." % url
+        sys.exit(1)
+
     l = filter(filter_unsolved, bl)
     
     if not l: