diff --git a/end/reportWeb/Pages/ReportModel.cs b/end/reportWeb/Pages/ReportModel.cs
index aee0697..10818ad 100644
--- a/end/reportWeb/Pages/ReportModel.cs
+++ b/end/reportWeb/Pages/ReportModel.cs
@@ -286,7 +286,8 @@ private void parse_fresh_ds()
                 }
             }
             reportDefineForWeb.CurrentReportDefine.calcGridNames = calcGridNames?.ToArray();
-            reportDefineForWeb.CurrentReportDefine.calcDsNames = new HashSet<String>( calcDsNames );
+            if (calcDsNames != null)
+                reportDefineForWeb.CurrentReportDefine.calcDsNames = new HashSet<String>( calcDsNames );
         } 
         protected internal ReportDefineForWeb reportDefineForWeb;
         public async Task output()
diff --git a/end/reportWeb/Startup.cs b/end/reportWeb/Startup.cs
index 686f7cd..d7c1120 100644
--- a/end/reportWeb/Startup.cs
+++ b/end/reportWeb/Startup.cs
@@ -353,7 +353,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env,ReportDbC
                     try
                     {
                         var m = MessageQueueBlock<DemoMessage>.Take();//Client(m.ConnectionId)
-                        await m.hubContext.Clients.Client(m.ConnectionId)?.SendAsync("ReceiveMessage",m.ConnectionId,m.Body);                    
+                        if (m.ConnectionId != null)
+                            await m.hubContext.Clients.Client(m.ConnectionId)?.SendAsync("ReceiveMessage",m.ConnectionId,m.Body);                    
                     }
                     catch (Exception ex)
                     {