diff --git a/src/fsfw/cfdp/handler/DestHandler.cpp b/src/fsfw/cfdp/handler/DestHandler.cpp
index 13b93a36..92b4341a 100644
--- a/src/fsfw/cfdp/handler/DestHandler.cpp
+++ b/src/fsfw/cfdp/handler/DestHandler.cpp
@@ -430,7 +430,7 @@ ReturnValue_t cfdp::DestHandler::sendFinishedPdu() {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     sif::warning << "cfdp::DestHandler:sendFinishedPdu: Getting store slot failed" << std::endl;
 #endif
-    // TODO: Error handling and event, this is a non CFDP specific error (most likely store is full)
+    fp.eventReporter->forwardEvent(events::STORE_ERROR, result, 0);
     return result;
   }
   size_t serLen = 0;
@@ -440,7 +440,7 @@ ReturnValue_t cfdp::DestHandler::sendFinishedPdu() {
     sif::warning << "cfdp::DestHandler::sendFinishedPdu: Serializing Finished PDU failed"
                  << std::endl;
 #endif
-    // TODO: Event, non CFDP specific error
+    fp.eventReporter->forwardEvent(events::SERIALIZATION_ERROR, result, 0);
     return result;
   }
   TmTcMessage msg(storeId);