diff --git a/examples/energy-management-app/energy-management-common/include/ChargingTargetsMemMgr.h b/examples/energy-management-app/energy-management-common/include/ChargingTargetsMemMgr.h
index b906f648174704..66009cdd84ca0e 100644
--- a/examples/energy-management-app/energy-management-common/include/ChargingTargetsMemMgr.h
+++ b/examples/energy-management-app/energy-management-common/include/ChargingTargetsMemMgr.h
@@ -113,6 +113,9 @@ class ChargingTargetsMemMgr
     /**
      * @brief Called to allocate and copy the chargingTargets into the current day schedule as set
      *        set by PrepareDaySchedule().
+     *        If an attempt is made to add more than kEvseTargetsMaxTargetsPerDay chargingTargets
+     *        for the current day schedule, then the chargingTarget is not added and an error message
+     *        is printed.
      *
      * @param chargingTargets  - The chargingTargets to add into the current day schedule
      */
diff --git a/examples/energy-management-app/energy-management-common/src/ChargingTargetsMemMgr.cpp b/examples/energy-management-app/energy-management-common/src/ChargingTargetsMemMgr.cpp
index d0dd2b414920e0..1642b76882178b 100644
--- a/examples/energy-management-app/energy-management-common/src/ChargingTargetsMemMgr.cpp
+++ b/examples/energy-management-app/energy-management-common/src/ChargingTargetsMemMgr.cpp
@@ -71,6 +71,10 @@ void ChargingTargetsMemMgr::AddChargingTarget(const EnergyEvse::Structs::Chargin
     {
         mDailyChargingTargets[mNumDailyChargingTargets++] = chargingTarget;
     }
+    else
+    {
+        ChipLogError(AppServer, "AddChargingTarget: trying to add too many chargingTargets");
+    }
 }
 
 EnergyEvse::Structs::ChargingTargetStruct::Type * ChargingTargetsMemMgr::GetChargingTargets() const