diff --git a/src/fsfw/cfdp/handler/DestHandler.cpp b/src/fsfw/cfdp/handler/DestHandler.cpp
index 92b4341a..2e59179b 100644
--- a/src/fsfw/cfdp/handler/DestHandler.cpp
+++ b/src/fsfw/cfdp/handler/DestHandler.cpp
@@ -446,10 +446,10 @@ ReturnValue_t cfdp::DestHandler::sendFinishedPdu() {
   TmTcMessage msg(storeId);
   result = fp.msgQueue->sendMessage(fp.packetDest.getReportReceptionQueue(), &msg);
   if (result != OK) {
-    // TODO: Error handling and event, this is a non CFDP specific error (most likely store is full)
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     sif::warning << "cfdp::DestHandler::sendFinishedPdu: Sending PDU failed" << std::endl;
 #endif
+    fp.eventReporter->forwardEvent(events::MSG_QUEUE_ERROR, result, 0);
     return result;
   }
   fsmRes.packetsSent++;