diff --git a/CompanyManagment.Application/WorkshopAppliction.cs b/CompanyManagment.Application/WorkshopAppliction.cs
index a6efd5de..c2110263 100644
--- a/CompanyManagment.Application/WorkshopAppliction.cs
+++ b/CompanyManagment.Application/WorkshopAppliction.cs
@@ -407,6 +407,10 @@ public class WorkshopAppliction : IWorkshopApplication
     public EditWorkshop GetDetails(long id)
     {
         var workshop = _workshopRepository.GetDetails(id);
+        if (workshop == null)
+        {
+            return null;
+        }
         if (workshop.IsClassified)
         {
             workshop.CreatePlan = _workshopPlanApplication.GetWorkshopPlanByWorkshopId(id);
diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/Ticket/Index.cshtml.cs b/ServiceHost/Areas/AdminNew/Pages/Company/Ticket/Index.cshtml.cs
index bf33a3ed..11b18fd1 100644
--- a/ServiceHost/Areas/AdminNew/Pages/Company/Ticket/Index.cshtml.cs
+++ b/ServiceHost/Areas/AdminNew/Pages/Company/Ticket/Index.cshtml.cs
@@ -80,7 +80,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.Ticket
 		public IActionResult OnGetShowDetailTicketByAdmin(long ticketID)
         {
             var res = _ticketApplication.GetDetails(ticketID);
-            res.WorkshopName = _workshopApplication.GetDetails(res.WorkshopId).WorkshopFullName;
+            res.WorkshopName = _workshopApplication.GetDetails(res.WorkshopId)?.WorkshopFullName??"";
             return Partial("DetailTicketModal", res);
         }