1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/org.eclipse.osee.ote.messaging.dds/src/org/eclipse/osee/ote/messaging/dds/entity/Entity.java b/plugins/org.eclipse.osee.ote.messaging.dds/src/org/eclipse/osee/ote/messaging/dds/entity/Entity.java
index 61263342b91..74b98a0ef4d 100644
--- a/plugins/org.eclipse.osee.ote.messaging.dds/src/org/eclipse/osee/ote/messaging/dds/entity/Entity.java
+++ b/plugins/org.eclipse.osee.ote.messaging.dds/src/org/eclipse/osee/ote/messaging/dds/entity/Entity.java
@@ -25,7 +25,7 @@ import org.eclipse.osee.ote.messaging.dds.listener.Listener;
  */
 public abstract class Entity {
 
-   private final EntityFactory parentFactory;
+   private EntityFactory parentFactory;
    private Listener listener;
 
    @SuppressWarnings("unused")
@@ -128,7 +128,7 @@ public abstract class Entity {
    public ReturnCode enable() {
 
       // Check pre-conditions
-      if (!parentFactory.isEnabled()) {
+      if (parentFactory != null && !parentFactory.isEnabled()) {
          return ReturnCode.PRECONDITION_NOT_MET;
       }
 
@@ -140,4 +140,9 @@ public abstract class Entity {
       enabled = true;
       return ReturnCode.OK;
    }
+   
+   protected void dispose() {
+      parentFactory = null;
+      listener = null;
+   }
 }