diff --git a/src/main/java/ui/graph/AUTGraphDisplay.java b/src/main/java/ui/graph/AUTGraphDisplay.java
index 1322cd8104eb1b5338810f9976d985cb182e8a15..026b62957bc435fe3f5ef0f03b72515534a5b71f 100755
--- a/src/main/java/ui/graph/AUTGraphDisplay.java
+++ b/src/main/java/ui/graph/AUTGraphDisplay.java
@@ -212,6 +212,7 @@ public class AUTGraphDisplay  implements MouseListener, ViewerListener, Runnable
             // to avoid 100% CPU usage. The blockingPump() method is only available from
             // the nightly builds.
         }
+	//viewPipe = null;
     }
     
     
@@ -224,8 +225,14 @@ public class AUTGraphDisplay  implements MouseListener, ViewerListener, Runnable
     }
     
     public void viewClosed(String id) {
-        TraceManager.addDev("View closed");
+        TraceManager.addDev("View closed and closed !");
         loop = false;
+	if (viewer != null) {
+	    viewer.close();
+	    viewer.disableAutoLayout();
+	}
+	viewer =  null;
+	vGraph.clear();
 	if (exitOnClose) {
 	    System.exit(1);
 	}