diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp
index c28e052..0fb515e 100644
--- a/lib/Sema/SemaOverload.cpp
+++ b/lib/Sema/SemaOverload.cpp
@@ -1344,7 +1344,8 @@
              = ToRecordDecl->lookup(ConstructorName);
            Con != ConEnd; ++Con) {
         CXXConstructorDecl *Constructor = cast<CXXConstructorDecl>(*Con);
-        if (Constructor->isConvertingConstructor())
+        if (!Constructor->isInvalidDecl() &&
+            Constructor->isConvertingConstructor())
           AddOverloadCandidate(Constructor, &From, 1, CandidateSet,
                                /*SuppressUserConversions=*/true, ForceRValue);
       }
diff --git a/test/SemaCXX/copy-constructor-error.cpp b/test/SemaCXX/copy-constructor-error.cpp
new file mode 100644
index 0000000..afe741f
--- /dev/null
+++ b/test/SemaCXX/copy-constructor-error.cpp
@@ -0,0 +1,13 @@
+// RUN: clang-cc -fsyntax-only -verify %s 
+
+struct S {	// expected-note {{candidate function}} 
+   S (S);	// expected-error {{copy constructor must pass its first argument by reference}} \\
+                // expected-note {{candidate function}}
+};
+
+S f();
+
+void g() { 
+  S a( f() );  // expected-error {{call to constructor of 'a' is ambiguous}}
+}
+