diff --git a/common.py b/common.py
index 9afd731..ba67284 100644
--- a/common.py
+++ b/common.py
@@ -290,8 +290,9 @@ def find_credentials(consumer, files, level=None):
             continue
         if cred.consumer.key == consumer:
             return cred        
-    raise IOError("No credentials found, please see the manage-credentials " \
-            "manpage for help on how to create them.")
+    raise IOError("No credentials found for '%s', please see the " \
+            "manage-credentials manpage for help on how to create " \
+            "one for this consumer." % consumer)
     
 def get_credentials(consumer, cred_file=None, level=None):
     files = list()
diff --git a/debian/changelog b/debian/changelog
index 4d2a773..22c72e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ubuntu-dev-tools (0.56) UNRELEASED; urgency=low
 
   * manage-credentials: Tighted security by making credentials files and
     folder world unreadable.
+  * common.py: Improved no credentials found error message to show which
+    consumer token is needed.
 
  -- Jonathan Davies <jpds@ubuntu.com>  Thu, 15 Jan 2009 12:35:12 +0000