diff --git a/include/clang/Analysis/PathSensitive/BugReporter.h b/include/clang/Analysis/PathSensitive/BugReporter.h
index 7f2511f..bf9aa00 100644
--- a/include/clang/Analysis/PathSensitive/BugReporter.h
+++ b/include/clang/Analysis/PathSensitive/BugReporter.h
@@ -215,6 +215,11 @@
     EmitBasicReport(BugName, BugStr, Loc, 0, 0);
   }
   
+  void EmitBasicReport(const char* BugName, const char* BugCategory,
+                       const char* BugStr, SourceLocation Loc) {
+    EmitBasicReport(BugName, BugCategory, BugStr, Loc, 0, 0);
+  }
+  
   void EmitBasicReport(const char* BugName, const char* BugStr,
                        SourceLocation Loc, SourceRange R) {
     EmitBasicReport(BugName, BugStr, Loc, &R, 1);
diff --git a/lib/Analysis/CheckNSError.cpp b/lib/Analysis/CheckNSError.cpp
index 25f610e..d4697aa 100644
--- a/lib/Analysis/CheckNSError.cpp
+++ b/lib/Analysis/CheckNSError.cpp
@@ -47,6 +47,7 @@
   void EmitWarnings(BugReporter& BR) { EmitGRWarnings(cast<GRBugReporter>(BR));}
   const char* getName() const { return "NSError** null dereference"; }
   const char* getDescription() const { return desc; }
+  const char* getCategory() const { return "Coding Conventions (Apple)"; }
 };  
   
 } // end anonymous namespace
@@ -79,6 +80,7 @@
   
   if (ResultTy == Ctx.VoidTy) {
     BR.EmitBasicReport("Bad return type when passing NSError**",
+              getCategory(),
               "Method accepting NSError** argument should have "
               "non-void return value to indicate that an error occurred.",
               CodeDecl.getLocation());