diff --git a/hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/NodeControllerService.java b/hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/NodeControllerService.java
index 6049a3b..ebfc486 100644
--- a/hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/NodeControllerService.java
+++ b/hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/NodeControllerService.java
@@ -303,6 +303,8 @@
         netManager.stop();
         datasetNetworkManager.stop();
         queue.stop();
+        if (ncAppEntryPoint != null)
+            ncAppEntryPoint.stop();
         LOGGER.log(Level.INFO, "Stopped NodeControllerService");
     }
 
diff --git a/pregelix/pregelix-runtime/src/main/java/edu/uci/ics/pregelix/runtime/bootstrap/NCApplicationEntryPoint.java b/pregelix/pregelix-runtime/src/main/java/edu/uci/ics/pregelix/runtime/bootstrap/NCApplicationEntryPoint.java
index 9607494..fe72d7a 100644
--- a/pregelix/pregelix-runtime/src/main/java/edu/uci/ics/pregelix/runtime/bootstrap/NCApplicationEntryPoint.java
+++ b/pregelix/pregelix-runtime/src/main/java/edu/uci/ics/pregelix/runtime/bootstrap/NCApplicationEntryPoint.java
@@ -19,9 +19,11 @@
 import edu.uci.ics.pregelix.dataflow.context.RuntimeContext;
 
 public class NCApplicationEntryPoint implements INCApplicationEntryPoint {
+    private RuntimeContext rCtx = null;
+
     @Override
     public void start(INCApplicationContext ncAppCtx, String[] args) throws Exception {
-        RuntimeContext rCtx = new RuntimeContext(ncAppCtx);
+        rCtx = new RuntimeContext(ncAppCtx);
         ncAppCtx.setApplicationObject(rCtx);
     }
 
@@ -32,6 +34,6 @@
 
     @Override
     public void stop() throws Exception {
-
+        rCtx.close();
     }
 }
\ No newline at end of file