From 908a609a53d2a1d171e74b93ad19e7727f891edb Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Sun, 16 Apr 2017 12:33:34 -0700
Subject: [PATCH] Bug 514950 - NullPointerException running Organize Includes

Change-Id: Ic851d389a28e838775f20879bb88ffe00b9b55c0
---
 .../internal/ui/refactoring/includes/BindingClassifier.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/BindingClassifier.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/BindingClassifier.java
index 17f52971b9a..d2071d2d6bb 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/BindingClassifier.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/BindingClassifier.java
@@ -1236,7 +1236,9 @@ public class BindingClassifier {
 		} else if (binding instanceof ICPPTemplateParameter) {
 			newBindings.add(binding);
 		} else if (binding instanceof ICPPUnknownBinding) {
-			newBindings.add(binding.getOwner());
+			IBinding owner = binding.getOwner();
+			if (owner != null)
+				newBindings.add(owner);
 		} else if (binding instanceof ICPPMethod) {
 			newBindings.add(binding);  // Include the method in case we need its inline definition.
 			if (binding instanceof ICPPConstructor)