diff --git a/PARR.API/Controllers/V1/JobUnitPreviewController.cs b/PARR.API/Controllers/V1/JobUnitPreviewController.cs
index bd164fcf..d1ff51ef 100644
--- a/PARR.API/Controllers/V1/JobUnitPreviewController.cs
+++ b/PARR.API/Controllers/V1/JobUnitPreviewController.cs
@@ -12,6 +12,8 @@ using PARR.Constants;
 using PARR.DAL.DomainServices.Interfaces;
 using PARR.DAL.Models.Job;
 using PARR.DAL.Services.Interfaces.Unit;
+using static PARR.API.Contracts.V1.ApiRoutes;
+using Job = PARR.DAL.Models.Job.Job;
 
 namespace PARR.API.Controllers.V1
 {
@@ -68,6 +70,9 @@ namespace PARR.API.Controllers.V1
 
             var units = await query.ToListAsync();
 
+            if (!units.Any())
+                return NoContent();
+
             var unitResponse = mapper.Map<List<UnitBaseResponse>>(units);
 
             return Ok(new Response<List<UnitBaseResponse>>(unitResponse, true));
diff --git a/PARR.API/MappingProfiles/DomainToResponseProfile.cs b/PARR.API/MappingProfiles/DomainToResponseProfile.cs
index 45644069..a92b9fed 100644
--- a/PARR.API/MappingProfiles/DomainToResponseProfile.cs
+++ b/PARR.API/MappingProfiles/DomainToResponseProfile.cs
@@ -317,8 +317,8 @@ namespace PARR.API.MappingProfiles
 
             CreateMap<JobUnitFilter, UnitFilterResponse>()
                 .ForMember(d => d.UnitFilterMask, o => o.MapFrom(s => s.UnitFilter))
-                .ForMember(d => d.FieldFilters, o => o.MapFrom(s => s.FieldFilters.OrderBy(o => o.UnitField.AihitName)))
-                .ForMember(d => d.RelationshipFilters, o => o.MapFrom(s => s.RelationshipFilters.OrderBy(o => o.UnitField.AihitName)));
+                .ForMember(d => d.FieldFilters, o => o.MapFrom(s => s.FieldFilters.OrderBy(o => o.UnitField!.AihitName)))
+                .ForMember(d => d.RelationshipFilters, o => o.MapFrom(s => s.RelationshipFilters.OrderBy(o => o.UnitField!.AihitName)));
 
             CreateMap<JobFieldFilter, FieldResponse>();