diff --git a/bsp_hosted/ObjectFactory.cpp b/bsp_hosted/ObjectFactory.cpp
index 2fd8230f..89b83041 100644
--- a/bsp_hosted/ObjectFactory.cpp
+++ b/bsp_hosted/ObjectFactory.cpp
@@ -99,9 +99,9 @@ void ObjectFactory::produce(void* args) {
                        supv::MAX_PACKET_SIZE * 20, UartModes::NON_CANONICAL);
   supervisorCookie->setNoFixedSizeReply();
   auto supvHelper = new PlocSupvUartManager(objects::PLOC_SUPERVISOR_HELPER);
-  new PlocSupervisorHandler(objects::PLOC_SUPERVISOR_HANDLER,
-                            supervisorCookie, Gpio(gpioIds::ENABLE_SUPV_UART, dummyGpioIF),
-                            pcdu::PDU1_CH6_PLOC_12V, *supvHelper);
+  new PlocSupervisorHandler(objects::PLOC_SUPERVISOR_HANDLER, supervisorCookie,
+                            Gpio(gpioIds::ENABLE_SUPV_UART, dummyGpioIF), pcdu::PDU1_CH6_PLOC_12V,
+                            *supvHelper);
 #endif /* OBSW_ADD_PLOC_SUPERVISOR == 1 */
 #endif
 
diff --git a/generators/bsp_q7s_events.csv b/generators/bsp_q7s_events.csv
index bb762004..9a89eca9 100644
--- a/generators/bsp_q7s_events.csv
+++ b/generators/bsp_q7s_events.csv
@@ -223,6 +223,8 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 13628;0x353c;SUPV_REPLY_SIZE_MISSMATCH;LOW;;linux/devices/ploc/PlocSupvUartMan.h
 13629;0x353d;SUPV_REPLY_CRC_MISSMATCH;LOW;;linux/devices/ploc/PlocSupvUartMan.h
 13630;0x353e;SUPV_UPDATE_PROGRESS;INFO;Will be triggered every 5 percent of the update progress. P1: First byte percent, third and fourth byte Sequence Count, P2: Bytes written;linux/devices/ploc/PlocSupvUartMan.h
+13631;0x353f;HDLC_FRAME_REMOVAL_ERROR;INFO;;linux/devices/ploc/PlocSupvUartMan.h
+13632;0x3540;HDLC_CRC_ERROR;INFO;;linux/devices/ploc/PlocSupvUartMan.h
 13700;0x3584;ALLOC_FAILURE;MEDIUM;;bsp_q7s/core/CoreController.h
 13701;0x3585;REBOOT_SW;MEDIUM; Software reboot occurred. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h
 13702;0x3586;REBOOT_MECHANISM_TRIGGERED;MEDIUM;The reboot mechanism was triggered. P1: First 16 bits: Last Chip, Last 16 bits: Last Copy, P2: Each byte is the respective reboot count for the slots;bsp_q7s/core/CoreController.h
diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp
index 1b534866..ac00745c 100644
--- a/generators/events/translateEvents.cpp
+++ b/generators/events/translateEvents.cpp
@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 237 translations.
+ * @brief    Auto-generated event translation file. Contains 239 translations.
  * @details
- * Generated on: 2022-11-15 17:44:20
+ * Generated on: 2022-11-16 15:25:08
  */
 #include "translateEvents.h"
 
@@ -225,6 +225,8 @@ const char *WRITE_MEMORY_FAILED_STRING = "WRITE_MEMORY_FAILED";
 const char *SUPV_REPLY_SIZE_MISSMATCH_STRING = "SUPV_REPLY_SIZE_MISSMATCH";
 const char *SUPV_REPLY_CRC_MISSMATCH_STRING = "SUPV_REPLY_CRC_MISSMATCH";
 const char *SUPV_UPDATE_PROGRESS_STRING = "SUPV_UPDATE_PROGRESS";
+const char *HDLC_FRAME_REMOVAL_ERROR_STRING = "HDLC_FRAME_REMOVAL_ERROR";
+const char *HDLC_CRC_ERROR_STRING = "HDLC_CRC_ERROR";
 const char *ALLOC_FAILURE_STRING = "ALLOC_FAILURE";
 const char *REBOOT_SW_STRING = "REBOOT_SW";
 const char *REBOOT_MECHANISM_TRIGGERED_STRING = "REBOOT_MECHANISM_TRIGGERED";
@@ -681,6 +683,10 @@ const char *translateEvents(Event event) {
       return SUPV_REPLY_CRC_MISSMATCH_STRING;
     case (13630):
       return SUPV_UPDATE_PROGRESS_STRING;
+    case (13631):
+      return HDLC_FRAME_REMOVAL_ERROR_STRING;
+    case (13632):
+      return HDLC_CRC_ERROR_STRING;
     case (13700):
       return ALLOC_FAILURE_STRING;
     case (13701):
diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp
index 4856c347..0890725e 100644
--- a/generators/objects/translateObjects.cpp
+++ b/generators/objects/translateObjects.cpp
@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 148 translations.
- * Generated on: 2022-11-15 17:44:20
+ * Generated on: 2022-11-16 15:25:08
  */
 #include "translateObjects.h"
 
diff --git a/linux/devices/ploc/PlocSupvUartMan.cpp b/linux/devices/ploc/PlocSupvUartMan.cpp
index 0833cd67..4fe9a033 100644
--- a/linux/devices/ploc/PlocSupvUartMan.cpp
+++ b/linux/devices/ploc/PlocSupvUartMan.cpp
@@ -51,8 +51,8 @@ ReturnValue_t PlocSupvUartManager::initializeInterface(CookieIF* cookie) {
   /* Get file descriptor */
   serialPort = open(devname.c_str(), O_RDWR);
   if (serialPort < 0) {
-    sif::warning << "ScexUartReader::initializeInterface: open call failed with error [" << errno
-                 << ", " << strerror(errno) << std::endl;
+    sif::warning << "PlocSupvUartManager::initializeInterface: open call failed with error ["
+                 << errno << ", " << strerror(errno) << std::endl;
     return FAILED;
   }
   // Setting up UART parameters
@@ -73,7 +73,7 @@ ReturnValue_t PlocSupvUartManager::initializeInterface(CookieIF* cookie) {
 
   uart::setBaudrate(tty, uartCookie->getBaudrate());
   if (tcsetattr(serialPort, TCSANOW, &tty) != 0) {
-    sif::warning << "ScexUartReader::initializeInterface: tcsetattr call failed with error ["
+    sif::warning << "PlocSupvUartManager::initializeInterface: tcsetattr call failed with error ["
                  << errno << ", " << strerror(errno) << std::endl;
   }
   // Flush received and unread data
diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp
index 1b534866..ac00745c 100644
--- a/linux/fsfwconfig/events/translateEvents.cpp
+++ b/linux/fsfwconfig/events/translateEvents.cpp
@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 237 translations.
+ * @brief    Auto-generated event translation file. Contains 239 translations.
  * @details
- * Generated on: 2022-11-15 17:44:20
+ * Generated on: 2022-11-16 15:25:08
  */
 #include "translateEvents.h"
 
@@ -225,6 +225,8 @@ const char *WRITE_MEMORY_FAILED_STRING = "WRITE_MEMORY_FAILED";
 const char *SUPV_REPLY_SIZE_MISSMATCH_STRING = "SUPV_REPLY_SIZE_MISSMATCH";
 const char *SUPV_REPLY_CRC_MISSMATCH_STRING = "SUPV_REPLY_CRC_MISSMATCH";
 const char *SUPV_UPDATE_PROGRESS_STRING = "SUPV_UPDATE_PROGRESS";
+const char *HDLC_FRAME_REMOVAL_ERROR_STRING = "HDLC_FRAME_REMOVAL_ERROR";
+const char *HDLC_CRC_ERROR_STRING = "HDLC_CRC_ERROR";
 const char *ALLOC_FAILURE_STRING = "ALLOC_FAILURE";
 const char *REBOOT_SW_STRING = "REBOOT_SW";
 const char *REBOOT_MECHANISM_TRIGGERED_STRING = "REBOOT_MECHANISM_TRIGGERED";
@@ -681,6 +683,10 @@ const char *translateEvents(Event event) {
       return SUPV_REPLY_CRC_MISSMATCH_STRING;
     case (13630):
       return SUPV_UPDATE_PROGRESS_STRING;
+    case (13631):
+      return HDLC_FRAME_REMOVAL_ERROR_STRING;
+    case (13632):
+      return HDLC_CRC_ERROR_STRING;
     case (13700):
       return ALLOC_FAILURE_STRING;
     case (13701):
diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp
index 4856c347..0890725e 100644
--- a/linux/fsfwconfig/objects/translateObjects.cpp
+++ b/linux/fsfwconfig/objects/translateObjects.cpp
@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 148 translations.
- * Generated on: 2022-11-15 17:44:20
+ * Generated on: 2022-11-16 15:25:08
  */
 #include "translateObjects.h"
 
diff --git a/tmtc b/tmtc
index a7999bdb..d5813e1a 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit a7999bdbb1d3f490d383c3b085b9019730ec1450
+Subproject commit d5813e1a422beae7d0cb092a885e0956e9f1ddc1