diff --git a/platform-mc/terminus_manager.cpp b/platform-mc/terminus_manager.cpp
index cbf56c5..10adefd 100644
--- a/platform-mc/terminus_manager.cpp
+++ b/platform-mc/terminus_manager.cpp
@@ -326,6 +326,7 @@
     {
         lg2::error("Failed to Get PLDM Types for terminus {TID}, error {ERROR}",
                    "TID", tid, "ERROR", rc);
+        unmapTid(tid);
         co_return PLDM_ERROR;
     }
 
@@ -337,6 +338,7 @@
     {
         lg2::error("Failed to create terminus manager for terminus {TID}",
                    "TID", tid);
+        unmapTid(tid);
         co_return PLDM_ERROR;
     }