diff --git a/buffet/device_registration_info.cc b/buffet/device_registration_info.cc
index 3dd5864..bd02b23 100644
--- a/buffet/device_registration_info.cc
+++ b/buffet/device_registration_info.cc
@@ -669,11 +669,7 @@
                                               const std::string& location,
                                               chromeos::ErrorPtr* error) {
   BuffetConfig::Transaction change{config_.get()};
-  if (!change.set_name(name)) {
-    chromeos::Error::AddTo(error, FROM_HERE, kErrorDomainBuffet,
-                           "invalid_parameter", "Empty device name");
-    return false;
-  }
+  change.set_name(name);
   change.set_description(description);
   change.set_location(location);
   change.Commit();