diff --git a/tensorflow/compiler/xla/service/compiler.cc b/tensorflow/compiler/xla/service/compiler.cc
index f71b2b6b9c6..3b1900428af 100644
--- a/tensorflow/compiler/xla/service/compiler.cc
+++ b/tensorflow/compiler/xla/service/compiler.cc
@@ -58,7 +58,8 @@ Compiler::GetPlatformCompilers() {
   LazyInitMutex();
   tensorflow::mutex_lock lock(*platform_compiler_mutex_);
   auto* factories = GetPlatformCompilerFactories();
-  CHECK(factories->find(platform_id) == factories->end());
+  CHECK(factories->find(platform_id) == factories->end())
+      << "Compiler factory already registered for platform";
   (*factories)[platform_id] = std::move(compiler_factory);
 }