diff --git a/debian/changelog b/debian/changelog
index 756398f..3008fd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,11 @@ ubuntu-dev-tools (0.122) UNRELEASED; urgency=low
   * lp-project-upload: Add an optional parameter for creating a new
     milestone to add future bugs to.
 
- -- Ted Gould <ted@ubuntu.com>  Tue, 19 Apr 2011 17:32:03 +0200
+  [ Brian Murray ]
+  * grab-attachments: download the attachments to a folder named after the bug
+    number e.g. bug-1
+
+ -- Brian Murray <brian@ubuntu.com>  Tue, 19 Apr 2011 12:41:41 -0700
 
 ubuntu-dev-tools (0.121) unstable; urgency=low
 
diff --git a/doc/grab-attachments.1 b/doc/grab-attachments.1
index 97a71bc..aa833c7 100644
--- a/doc/grab-attachments.1
+++ b/doc/grab-attachments.1
@@ -7,7 +7,7 @@ grab\-attachments \- downloads attachments from a Launchpad bug
 .B grab\-attachments \-h
 .SH DESCRIPTION
 \fBgrab\-attachments\fR is a script to download all attachments from a
-Launchpad bug report into the current directory.
+Launchpad bug report into the a directory named after the bug e.g. bug-1.
 
 .SH OPTIONS
 Listed below are the command line options for grab\-attachments:
diff --git a/grab-attachments b/grab-attachments
index 8d52b03..65ded09 100755
--- a/grab-attachments
+++ b/grab-attachments
@@ -61,7 +61,7 @@ def main():
             try:
                 os.mkdir(bug_folder_name)
             except OSError, error:
-                if 'file exists' in error:
+                if error.errno == 17:
                     continue
 
             for attachment in bug.attachments: