diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/pom.xml b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/pom.xml
index ad5a7212..7f210fd7 100644
--- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/pom.xml
+++ b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui.endpoint/pom.xml
@@ -47,10 +47,6 @@
             <artifactId>org.wso2.carbon.event.output.adapter.extensions.ui</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents.wso2</groupId>
-            <artifactId>httpcore</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
diff --git a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/UIEventAdapter.java b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/UIEventAdapter.java
index f34ee03d..1da9949c 100644
--- a/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/UIEventAdapter.java
+++ b/modules/iot-extensions/components/das-extensions/org.wso2.carbon.event.output.adapter.extensions.ui/src/main/java/org/wso2/carbon/event/output/adapter/extensions/ui/UIEventAdapter.java
@@ -343,11 +343,12 @@ public class UIEventAdapter implements OutputEventAdapter {
         // get all subscribed web-socket sessions.
         CopyOnWriteArrayList<CEPWebSocketSession> cepWebSocketSessions =
                 uiOutputCallbackControllerServiceImpl.getSessions(tenantId, streamId);
-
-        for (CEPWebSocketSession cepWebSocketSession : cepWebSocketSessions) {
-            boolean isValidSession = validateEventAgainstSessionFilters(event, cepWebSocketSession);
-            if (isValidSession) {
-                validSessions.add(cepWebSocketSession);
+        if (cepWebSocketSessions != null) {
+            for (CEPWebSocketSession cepWebSocketSession : cepWebSocketSessions) {
+                boolean isValidSession = validateEventAgainstSessionFilters(event, cepWebSocketSession);
+                if (isValidSession) {
+                    validSessions.add(cepWebSocketSession);
+                }
             }
         }
         return validSessions;
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 6d6c2a2d..202aa3d4 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -693,7 +693,7 @@
                                     org.wso2.carbon.analytics-common:org.wso2.carbon.event.publisher.feature:${carbon.analytics.common.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.event-processing:org.wso2.carbon.event.processor.server.feature:${carbon.event-processing.version}
+                                    org.wso2.carbon.event-processing:org.wso2.carbon.event.processor.feature:${carbon.event-processing.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics-common:org.wso2.carbon.event.tracer.feature:${carbon.analytics.common.version}
@@ -1499,7 +1499,7 @@
                                     <version>${carbon.analytics.common.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.event.processor.server.feature.group</id>
+                                    <id>org.wso2.carbon.event.processor.feature.group</id>
                                     <version>${carbon.event-processing.version}</version>
                                 </feature>
                                 <feature>