1 files changed, 4 insertions, 1 deletions
diff --git a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeContentAssistProcessor.java b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeContentAssistProcessor.java
index 06ca42db162..b270e15da3b 100644
--- a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeContentAssistProcessor.java
+++ b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeContentAssistProcessor.java
@@ -58,7 +58,10 @@ public class CompositeContentAssistProcessor implements IContentAssistProcessor
 	public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {
 		List<IContextInformation> res = new ArrayList<>();
 		for (IContentAssistProcessor processor : this.fContentAssistProcessors) {
-			res.addAll(Arrays.asList(processor.computeContextInformation(viewer, offset)));
+			IContextInformation[] contextInformation = processor.computeContextInformation(viewer, offset);
+			if (contextInformation != null) {
+				res.addAll(Arrays.asList(contextInformation));
+			}
 		}
 		return res.toArray(new IContextInformation[res.size()]);
 	}