diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 9f37e90..b9fc5b7 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -1251,10 +1251,10 @@
           *isOverridingProperty = true;
           return 0;
         }
-        // else
-        // FIXME:
-        // no matching property found in the main class. Must simply
-        // add this property to the main class's property list.
+        // No matching property found in the main class. Just fall thru
+        // and add property to the anonymous category. It looks like
+	// it works as is. This category becomes just like a category
+	// for its primary class.
       } else {
           Diag(CDecl->getLocation(), diag::err_continuation_class);
           *isOverridingProperty = true;
diff --git a/test/SemaObjC/continuation-class-err.m b/test/SemaObjC/continuation-class-err.m
new file mode 100644
index 0000000..1d4725f
--- /dev/null
+++ b/test/SemaObjC/continuation-class-err.m
@@ -0,0 +1,15 @@
+// RUN: clang -fsyntax-only -verify %s
+
+@interface ReadOnly 
+{
+  id _object;
+  id _object1;
+}
+@property(readonly, assign) id object;
+@property(readwrite, assign) id object1;
+@end
+
+@interface ReadOnly ()
+@property(readwrite, copy) id object;	// expected-warning {{property attribute in continuation class does not match the primary class}}
+@property(readonly) id object1; // expected-error {{use contination class to override 'readonly' property with 'readwrite'}}
+@end