1 files changed, 8 insertions, 2 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/ScrollView.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/ScrollView.java
index 7ba6a39540..4922da75af 100755
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/ScrollView.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/uml2sd/ScrollView.java
@@ -868,10 +868,16 @@ public class ScrollView extends Composite {
 
         @Override
         public void run() {
-            Display.getDefault().asyncExec(new Runnable() {
+            final Display display = Display.getDefault();
+            if ((display == null) || display.isDisposed()) {
+                return;
+            }
+            display.asyncExec(new Runnable() {
                 @Override
                 public void run() {
-                    scrollView.scrollBy(deltaX, deltaY);
+                    if (!scrollView.isDisposed()) {
+                        scrollView.scrollBy(deltaX, deltaY);
+                    }
                 }
             });
         }