diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index e4f56d806b3d8239a15bd76ae55289a69c728f62..5a0bd7170ba42697397fe53b7434167e678894b8 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -6287,7 +6287,7 @@ tsubst_friend_function (tree decl, tree args)
 	  tree fn = check_classfn (context,
 				   new_friend, NULL_TREE);
 
-	  if (fn)
+	  if (fn && fn != error_mark_node)
 	    new_friend = fn;
 	}
     }