diff --git a/src/tsg_bridge.cpp b/src/tsg_bridge.cpp
index 584e4ed..2368acc 100644
--- a/src/tsg_bridge.cpp
+++ b/src/tsg_bridge.cpp
@@ -34,6 +34,12 @@ void free_context_label(const struct streaminfo *a_stream, int bridge_id, void *
 			context->mid=NULL;
 		}
 
+		if(context->hited_result!=NULL)
+		{
+			dictator_free(a_stream->threadnum, (void *)context->hited_result);
+			context->hited_result=NULL;
+		}
+
 		dictator_free(a_stream->threadnum, (void *)context);
 		context=NULL;
 	}
diff --git a/src/tsg_entry.cpp b/src/tsg_entry.cpp
index 5b8ea56..bf5485a 100644
--- a/src/tsg_entry.cpp
+++ b/src/tsg_entry.cpp
@@ -1156,6 +1156,11 @@ static void set_shaping_result_to_project(const struct streaminfo *a_stream, str
 		}
 	}
 
+	if(inc_result==0)
+	{
+		return ;
+	}
+
 	struct notify_shaping_policy sync_result={0, {0}};
 	sync_result.shaping_result_num=inc_result_num;
 	memcpy(sync_result.shaping_result, inc_result, inc_result_num*sizeof(struct Maat_rule_t));