diff --git a/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ContentProposalAdapter.java b/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ContentProposalAdapter.java
index b7640f92216..a5c5b2e6bcc 100644
--- a/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ContentProposalAdapter.java
+++ b/bundles/org.eclipse.jface/src/org/eclipse/jface/fieldassist/ContentProposalAdapter.java
@@ -865,7 +865,9 @@ public int open() {
 		 */
 		@Override
 		public boolean close() {
-			popupCloser.removeListeners();
+			if (popupCloser != null) {
+				popupCloser.removeListeners();
+			}
 			if (infoPopup != null) {
 				infoPopup.close();
 			}