diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java
index 7ecbecd9ed6..e73366044aa 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/wizards/classwizard/NewClassWizardUtil.java
@@ -82,7 +82,7 @@ public class NewClassWizardUtil {
     public static ICContainer getSourceFolder(IPath path) {
         if (path == null)
             return null;
-        while (!path.isEmpty()) {
+        while (path.segmentCount() > 0) {
             IResource res = getWorkspaceRoot().findMember(path);
             if (res != null && res.exists()) {
                 int resType = res.getType();