diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
index 9f8c8a7..276d0ca 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
@@ -736,6 +736,9 @@
 	public static Image getImage(IAdaptable adaptable) {
 		if (adaptable != null) {
 			IWorkbenchAdapter o= Adapters.adapt(adaptable, IWorkbenchAdapter.class);
+			if (o == null) {
+				return null;
+			}
 			ImageDescriptor id= o.getImageDescriptor(adaptable);
 			if (id != null) {
 				Image image= fgImages2.get(id);