diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
index e1968ecfc1d02cb63eb913d42c7d72c0fcd0b687..d00fb66986f657fa79d9df8de6f4d3c3ab93badf 100644
--- a/core/src/main/java/hudson/model/AbstractItem.java
+++ b/core/src/main/java/hudson/model/AbstractItem.java
@@ -730,18 +730,16 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet
                                 
                         if (subtask != null) {        
                             Item item = Tasks.getItemOf(subtask);
-                            if (item != null) {
-                                while (item != null) {
-                                    if (item == this) {
-                                        buildsInProgress.put(e, e.getCurrentExecutable());
-                                        e.interrupt(Result.ABORTED);
-                                        break;
-                                    }
-                                    if (item.getParent() instanceof Item) {
-                                        item = (Item) item.getParent();
-                                    } else {
-                                        break;
-                                    }
+                            while (item != null) {
+                                if (item == this) {
+                                    buildsInProgress.put(e, e.getCurrentExecutable());
+                                    e.interrupt(Result.ABORTED);
+                                    break;
+                                }
+                                if (item.getParent() instanceof Item) {
+                                    item = (Item) item.getParent();
+                                } else {
+                                    break;
                                 }
                             }
                         }