diff --git a/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/Screenshots.java b/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/Screenshots.java
index 7ef7ea5d678..385c641748c 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/Screenshots.java
+++ b/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/Screenshots.java
@@ -49,6 +49,9 @@ protected void finished(Description description) {
 		}
 
 		public void dispose() {
+			if (shell == null) {
+				return;
+			}
 			Widget widget = shell.get();
 			if (widget != null && !widget.isDisposed()) {
 				widget.dispose();