diff --git a/lib/cli/nodeupdateconfigcommand.cpp b/lib/cli/nodeupdateconfigcommand.cpp
index 716ffb171..57079affc 100644
--- a/lib/cli/nodeupdateconfigcommand.cpp
+++ b/lib/cli/nodeupdateconfigcommand.cpp
@@ -118,7 +118,7 @@ int NodeUpdateConfigCommand::Run(const boost::program_options::variables_map& vm
 
 			if (host == "localhost") {
 				Log(LogWarning, "cli")
-				    << "Ignoring host '" << host << "'. Please make sure to configure a unique name on your node '" << node_name << "'.";
+				    << "Ignoring host '" << host << "'. Please make sure to configure a unique name on your node '" << endpoint << "'.";
 				continue;
 			}
 
diff --git a/lib/cli/repositoryutility.cpp b/lib/cli/repositoryutility.cpp
index 5dc833d1e..06702be88 100644
--- a/lib/cli/repositoryutility.cpp
+++ b/lib/cli/repositoryutility.cpp
@@ -362,7 +362,7 @@ bool RepositoryUtility::RemoveObjectInternal(const String& name, const String& t
 	String path = GetRepositoryObjectConfigPath(type, attrs) + "/" + name + ".conf";
 
 	if (!Utility::PathExists(path)) {
-		Log(LogCritical, "cli")
+		Log(LogWarning, "cli")
 		    << type << " '" << name << "' does not exist.";
 		return true;
 	}