diff --git a/src/CommandManager.cpp b/src/CommandManager.cpp
index f499dd15..7d5365bb 100644
--- a/src/CommandManager.cpp
+++ b/src/CommandManager.cpp
@@ -39,9 +39,9 @@ namespace OpenWifi {
 								   fmt::format("({}): Invalid RPC response.", SerialNumberStr));
 					} else {
 						uint64_t ID = Payload->get(uCentralProtocol::ID);
-						poco_debug(Logger(), fmt::format("({}): Processing {} response.",
-														 SerialNumberStr, ID));
 						if (ID > 1) {
+							poco_debug(Logger(), fmt::format("({}): Processing {} response.",
+															 SerialNumberStr, ID));
 							std::lock_guard Lock(LocalMutex_);
 							auto RPC = OutStandingRequests_.find(ID);
 							if (RPC == OutStandingRequests_.end()) {
diff --git a/src/RESTAPI/RESTAPI_device_commandHandler.cpp b/src/RESTAPI/RESTAPI_device_commandHandler.cpp
index 9b050189..532c3038 100644
--- a/src/RESTAPI/RESTAPI_device_commandHandler.cpp
+++ b/src/RESTAPI/RESTAPI_device_commandHandler.cpp
@@ -520,7 +520,13 @@ namespace OpenWifi {
 		std::string EncodedScript;
 		if (!SCR.scriptId.empty()) {
 			GWObjects::ScriptEntry Existing;
-			if (!StorageService()->ScriptDB().GetRecord("id", SCR.scriptId, Existing)) {
+			if(Utils::ValidUUID(SCR.scriptId)) {
+				if (!StorageService()->ScriptDB().GetRecord("id", SCR.scriptId, Existing)) {
+					CallCanceled("SCRIPT", CMD_UUID, CMD_RPC,
+								 RESTAPI::Errors::MissingOrInvalidParameters);
+					return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
+				}
+			} else if(!StorageService()->ScriptDB().GetRecord("name", SCR.scriptId, Existing)) {
 				CallCanceled("SCRIPT", CMD_UUID, CMD_RPC,
 							 RESTAPI::Errors::MissingOrInvalidParameters);
 				return BadRequest(RESTAPI::Errors::MissingOrInvalidParameters);
diff --git a/test_scripts/curl/cli b/test_scripts/curl/cli
index 8497379d..49987556 100755
--- a/test_scripts/curl/cli
+++ b/test_scripts/curl/cli
@@ -684,7 +684,7 @@ telemetry_to_kafka() {
 
 runscript() {
 	scriptcontent=$(base64 -i $3)
-	payload="$(printf '{ "serialNumber": "%s", "type": "%s" , "timeout": 30, "script" : "%s" , "deferred" : false, when" : 0 }' "$1" "$2" "$scriptcontent" )"
+	payload="$(printf '{ "serialNumber": "%s", "type": "%s" , "timeout": 30, "script" : "%s" , "deferred" : false, "when" : 0 }' "$1" "$2" "$scriptcontent" )"
 	curl  ${FLAGS} -X POST "https://${OWGW}/api/v1/device/$1/script" \
 				  -H "Content-Type: application/json" \
 				  -H "Accept: application/json" \