diff --git a/src/applications/feed/worker/FeedPushWorker.php b/src/applications/feed/worker/FeedPushWorker.php
index 90407f6a75..3eff676e99 100644
--- a/src/applications/feed/worker/FeedPushWorker.php
+++ b/src/applications/feed/worker/FeedPushWorker.php
@@ -13,7 +13,9 @@ abstract class FeedPushWorker extends PhabricatorWorker {
 
     if (!$story) {
       throw new PhabricatorWorkerPermanentFailureException(
-        pht('Feed story does not exist.'));
+        pht(
+          'Feed story (with key "%s") does not exist or could not be loaded.',
+          $key));
     }
 
     return $story;
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
index 8e6d816769..c08451624d 100644
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -68,6 +68,7 @@ abstract class PhabricatorApplicationTransactionEditor
   private $mailCCPHIDs = array();
   private $feedNotifyPHIDs = array();
   private $feedRelatedPHIDs = array();
+  private $feedShouldPublish = false;
   private $modularTypes;
 
   private $transactionQueue = array();
@@ -1159,6 +1160,7 @@ abstract class PhabricatorApplicationTransactionEditor
     }
 
     if ($this->shouldPublishFeedStory($object, $xactions)) {
+      $this->feedShouldPublish = true;
       $this->feedRelatedPHIDs = $this->getFeedRelatedPHIDs($object, $xactions);
       $this->feedNotifyPHIDs = $this->getFeedNotifyPHIDs($object, $xactions);
     }
@@ -1216,8 +1218,7 @@ abstract class PhabricatorApplicationTransactionEditor
         ));
     }
 
-    if ($this->shouldPublishFeedStory($object, $xactions)) {
-
+    if ($this->feedShouldPublish) {
       $mailed = array();
       foreach ($messages as $mail) {
         foreach ($mail->buildRecipientList() as $phid) {
@@ -3512,6 +3513,7 @@ abstract class PhabricatorApplicationTransactionEditor
       'mailCCPHIDs',
       'feedNotifyPHIDs',
       'feedRelatedPHIDs',
+      'feedShouldPublish',
     );
   }