diff --git a/de.gebit.integrity.eclipse/src/de/gebit/integrity/eclipse/views/IntegrityTestRunnerView.java b/de.gebit.integrity.eclipse/src/de/gebit/integrity/eclipse/views/IntegrityTestRunnerView.java
index d70ad930b..cc3d962b2 100644
--- a/de.gebit.integrity.eclipse/src/de/gebit/integrity/eclipse/views/IntegrityTestRunnerView.java
+++ b/de.gebit.integrity.eclipse/src/de/gebit/integrity/eclipse/views/IntegrityTestRunnerView.java
@@ -2237,12 +2237,12 @@ public void run() {
 						treeViewer));
 
 				// the drawer must be manually disposed
-				TestTreeContentDrawer tempOldContentDrawer = viewerContentDrawer;
+				if (viewerContentDrawer != null) {
+					viewerContentDrawer.dispose(treeViewer.getTree());
+				}
 				viewerContentDrawer = new TestTreeContentDrawer(setList, breakpointSet, Display.getCurrent());
 				viewerContentDrawer.attachToTree(treeViewer.getTree());
-				if (tempOldContentDrawer != null) {
-					tempOldContentDrawer.dispose(treeViewer.getTree());
-				}
+
 				treeViewer.setInput(setList);
 
 				((TestTreeContentProvider) treeViewer.getContentProvider()).expandToLevel(lastExpansionLevel + 1);