diff --git a/linux/devices/ploc/PlocSupervisorHandler.cpp b/linux/devices/ploc/PlocSupervisorHandler.cpp
index f683998d..1cff8884 100644
--- a/linux/devices/ploc/PlocSupervisorHandler.cpp
+++ b/linux/devices/ploc/PlocSupervisorHandler.cpp
@@ -417,6 +417,9 @@ ReturnValue_t PlocSupervisorHandler::buildCommandFromCommand(DeviceCommandId_t d
       break;
     }
     case LOGGING_SET_TOPIC: {
+      if(commandData == nullptr or commandDataLen == 0) {
+        return HasActionsIF::INVALID_PARAMETERS;
+      }
       uint8_t tpc = *(commandData);
       RequestLoggingData packet(spParams);
       result = packet.buildPacket(RequestLoggingData::Sa::SET_LOGGING_TOPIC, tpc);