diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java
index 1c829dc42af9efd3e190937b257c043f0de24930..0588c63ea5b48a248dab38e84de3585eced4cfd5 100644
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
@@ -719,7 +719,9 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
                         String msg = "Publisher " + bs.getClass().getName() + " aborted due to exception";
                         e.printStackTrace(listener.error(msg));
                         LOGGER.log(WARNING, msg, e);
-                        setResult(Result.FAILURE);
+                        if (phase) {
+                            setResult(Result.FAILURE);
+                        }
                     }
             }
             return r;
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index 8afa2bf8fc249b630ff8cfa08e18bd76f8db28ac..a045fb6141dc6e05743d4dfb17f05000a20462e9 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -422,7 +422,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
 
     public void setResult(Result r) {
         // state can change only when we are building
-        assert state==State.BUILDING;
+        assert state==State.BUILDING : state;
 
         // result can only get worse
         if(result==null) {