diff --git a/internal/filedesc/build.go b/internal/filedesc/build.go
index 427e26e..52cbdf1 100644
--- a/internal/filedesc/build.go
+++ b/internal/filedesc/build.go
@@ -6,6 +6,8 @@
 package filedesc
 
 import (
+	"log"
+
 	"google.golang.org/protobuf/internal/encoding/wire"
 	"google.golang.org/protobuf/internal/fieldnum"
 	"google.golang.org/protobuf/reflect/protoreflect"
@@ -105,7 +107,7 @@
 	out.Services = fd.allServices
 
 	if err := db.FileRegistry.Register(fd); err != nil {
-		panic(err)
+		CheckRegistryError(err)
 	}
 	return out
 }
@@ -150,3 +152,13 @@
 		}
 	}
 }
+
+// CheckRegistryError handles registration errors.
+// It is a variable so that its behavior can be replaced in another source file.
+var CheckRegistryError = func(err error) {
+	log.Printf(""+
+		"WARNING: %v\n"+
+		"A future release will panic on registration conflicts.\n"+
+		// TODO: Add a URL pointing to documentation on how to resolve conflicts.
+		"\n", err)
+}
diff --git a/internal/filetype/build.go b/internal/filetype/build.go
index fa1bb9a..3428040 100644
--- a/internal/filetype/build.go
+++ b/internal/filetype/build.go
@@ -155,7 +155,7 @@
 
 			// Register enum types.
 			if err := tb.TypeRegistry.Register(&out.Enums[i]); err != nil {
-				panic(err)
+				fdesc.CheckRegistryError(err)
 			}
 		}
 	}
@@ -183,7 +183,7 @@
 
 			// Register message types.
 			if err := tb.TypeRegistry.Register(&out.Messages[i]); err != nil {
-				panic(err)
+				fdesc.CheckRegistryError(err)
 			}
 		}
 
@@ -251,7 +251,7 @@
 
 			// Register extension types.
 			if err := tb.TypeRegistry.Register(&out.Extensions[i]); err != nil {
-				panic(err)
+				fdesc.CheckRegistryError(err)
 			}
 		}
 	}
diff --git a/reflect/protoregistry/registry.go b/reflect/protoregistry/registry.go
index 6efc206..33552f1 100644
--- a/reflect/protoregistry/registry.go
+++ b/reflect/protoregistry/registry.go
@@ -617,7 +617,7 @@
 	if prevPkg == "" || currPkg == "" || prevPkg == currPkg {
 		return err
 	}
-	return errors.New("%s; previously from %q, currently from %q", err, prevPkg, currPkg)
+	return errors.New("%s\n\tpreviously from: %q\n\tcurrently from:  %q", err, prevPkg, currPkg)
 }
 
 func goPackage(v interface{}) string {