diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
index f380ca3d85f..a75313fe8e4 100644
--- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
+++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
@@ -574,11 +574,11 @@ public void openCompareEditor(final CompareEditorInput input,
 		CompareConfiguration configuration = input.getCompareConfiguration();
 		if (configuration != null) {
 			IPreferenceStore ps= configuration.getPreferenceStore();
-			boolean unifiedDiffEnabled = ps.getBoolean(ComparePreferencePage.UNIFIED_DIFF);
-			if (unifiedDiffEnabled && openUnifiedDiffInEditor(input, page, editor, activate)) {
-				return;
-			}
 			if (ps != null) {
+				if (ps.getBoolean(ComparePreferencePage.UNIFIED_DIFF)
+						&& openUnifiedDiffInEditor(input, page, editor, activate)) {
+					return;
+				}
 				configuration.setProperty(
 						CompareConfiguration.USE_OUTLINE_VIEW,
 						Boolean.valueOf(ps.getBoolean(ComparePreferencePage.USE_OUTLINE_VIEW)));