diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs
index d3a105a..7d96d7c 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs
@@ -430,7 +430,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
                         {
                             var currCalendarID = currCalendar.CALENDAR_ID;
                             var currDepartmentConfig = GetEntity<T_FM_DEPARTMENT_CALENDAR_CONFIG_TEAM>(t => t.TEAM_ID == model.CLASS_TEAM_ID && t.IS_DELETED == false, "Nav_DepartmentCalendarConfig");
-                            if (currDepartmentConfig != null && currDepartmentConfig.Nav_DepartmentCalendarConfig.IS_HANDOVER == true)
+                            if (currDepartmentConfig != null && currDepartmentConfig.Nav_DepartmentCalendarConfig!=null && currDepartmentConfig.Nav_DepartmentCalendarConfig.IS_HANDOVER == true)
                             {
 
                                 var searchFilter = new BaseFilter(model.ORG_ID);