diff --git a/gcc/cp/except.cc b/gcc/cp/except.cc
index 4f40a49ae3f..9ec635af74d 100644
--- a/gcc/cp/except.cc
+++ b/gcc/cp/except.cc
@@ -982,6 +982,9 @@ can_convert_eh (tree to, tree from)
   if (same_type_ignoring_top_level_qualifiers_p (to, from))
     return true;
 
+  if (NULLPTR_TYPE_P (from) && TYPE_PTR_OR_PTRMEM_P (to))
+    return true;
+
   if (TYPE_PTR_P (to) && TYPE_PTR_P (from))
     {
       to = TREE_TYPE (to);
diff --git a/gcc/testsuite/g++.dg/eh/can-convert-nullptr.C b/gcc/testsuite/g++.dg/eh/can-convert-nullptr.C
new file mode 100644
index 00000000000..b609234591e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/eh/can-convert-nullptr.C
@@ -0,0 +1,7 @@
+// { dg-do compile { target c++11 } }
+
+int main() {
+  try { throw nullptr; }
+  catch (void *) {}
+  catch (decltype(nullptr)) {} // { dg-warning "will be caught by earlier handler" }
+}