diff --git a/Src/Asp.Net/SqlServerTest/UnitTest/UCustom012.cs b/Src/Asp.Net/SqlServerTest/UnitTest/UCustom012.cs
index 770d65bf7..a8f88378f 100644
--- a/Src/Asp.Net/SqlServerTest/UnitTest/UCustom012.cs
+++ b/Src/Asp.Net/SqlServerTest/UnitTest/UCustom012.cs
@@ -81,9 +81,10 @@ namespace OrmTest
             db.ThenMapper(list.Select(it => it.SchoolA), sch =>
             {
                 //参数1: room表关联字段  参数2: school表关联字段，  参数3: school当前记录
-                sch.RoomList = db.Queryable<RoomA>().SetContext(room => room.SchoolId, () => sch.SchoolId, sch).ToList();
-
-                sch.TeacherList = db.Queryable<TeacherA>().SetContext(teachera => teachera.SchoolId, () => sch.SchoolId, sch).ToList();
+                if(sch!=null)
+                  sch.RoomList = db.Queryable<RoomA>().SetContext(room => room.SchoolId, () => sch.SchoolId, sch).ToList();
+                if (sch != null)
+                    sch.TeacherList = db.Queryable<TeacherA>().SetContext(teachera => teachera.SchoolId, () => sch.SchoolId, sch).ToList();
             });
      
 
diff --git a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
index b3d501717..f1f656065 100644
--- a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
+++ b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
@@ -1332,6 +1332,10 @@ namespace SqlSugar
         }
         public List<T> SetContext<ParameterT>(Expression<Func<T, object>> thisFiled, Expression<Func<object>> mappingFiled, ParameterT parameter) 
         {
+            if (parameter == null) 
+            {
+                return new List<T>();
+            }
             List<T> result = new List<T>();
             var entity = this.Context.EntityMaintenance.GetEntityInfo<ParameterT>();
             var queryableContext = this.Context.TempItems["Queryable_To_Context"] as MapperContext<ParameterT>;