diff --git a/libweave/src/commands/command_manager.cc b/libweave/src/commands/command_manager.cc
index 22d00dc..5933146 100644
--- a/libweave/src/commands/command_manager.cc
+++ b/libweave/src/commands/command_manager.cc
@@ -183,7 +183,7 @@
 void CommandManager::AddCommandHandler(
     const std::string& command_name,
     const Device::CommandHandlerCallback& callback) {
-  CHECK(command_name.empty() || base_dictionary_.FindCommand(command_name))
+  CHECK(command_name.empty() || dictionary_.FindCommand(command_name))
       << "Command undefined: " << command_name;
   command_queue_.AddCommandHandler(command_name, callback);
 }