diff --git a/src/applications/phriction/controller/PhrictionMoveController.php b/src/applications/phriction/controller/PhrictionMoveController.php
index a5febbbaaa..53e5ae16ec 100644
--- a/src/applications/phriction/controller/PhrictionMoveController.php
+++ b/src/applications/phriction/controller/PhrictionMoveController.php
@@ -1,115 +1,127 @@
 <?php
 
 final class PhrictionMoveController extends PhrictionController {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $this->getViewer();
 
     $document = id(new PhrictionDocumentQuery())
       ->setViewer($viewer)
       ->withIDs(array($request->getURIData('id')))
       ->needContent(true)
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->executeOne();
     if (!$document) {
       return new Aphront404Response();
     }
 
     $slug = $document->getSlug();
     $cancel_uri = PhrictionDocument::getSlugURI($slug);
 
     $v_slug = $slug;
     $e_slug = null;
 
     $v_note = '';
 
     $validation_exception = null;
     if ($request->isFormPost()) {
       $v_note = $request->getStr('description');
       $v_slug = $request->getStr('slug');
+      $normal_slug = PhabricatorSlug::normalize($v_slug);
 
       // If what the user typed isn't what we're actually using, warn them
       // about it.
       if (strlen($v_slug)) {
-        $normal_slug = PhabricatorSlug::normalize($v_slug);
         $no_slash_slug = rtrim($normal_slug, '/');
         if ($normal_slug !== $v_slug && $no_slash_slug !== $v_slug) {
           return $this->newDialog()
             ->setTitle(pht('Adjust Path'))
             ->appendParagraph(
               pht(
                 'The path you entered (%s) is not a valid wiki document '.
                 'path. Paths may not contain spaces or special characters.',
                 phutil_tag('strong', array(), $v_slug)))
             ->appendParagraph(
               pht(
                 'Would you like to use the path %s instead?',
                 phutil_tag('strong', array(), $normal_slug)))
             ->addHiddenInput('slug', $normal_slug)
             ->addHiddenInput('description', $v_note)
             ->addCancelButton($cancel_uri)
             ->addSubmitButton(pht('Accept Path'));
         }
       }
 
       $editor = id(new PhrictionTransactionEditor())
         ->setActor($viewer)
         ->setContentSourceFromRequest($request)
         ->setContinueOnNoEffect(true)
         ->setDescription($v_note);
 
       $xactions = array();
       $xactions[] = id(new PhrictionTransaction())
         ->setTransactionType(PhrictionTransaction::TYPE_MOVE_TO)
         ->setNewValue($document);
-      $target_document = PhrictionDocument::initializeNewDocument(
-        $viewer,
-        $v_slug);
+      $target_document = id(new PhrictionDocumentQuery())
+        ->setViewer(PhabricatorUser::getOmnipotentUser())
+        ->withSlugs(array($normal_slug))
+        ->needContent(true)
+        ->requireCapabilities(
+          array(
+            PhabricatorPolicyCapability::CAN_VIEW,
+            PhabricatorPolicyCapability::CAN_EDIT,
+          ))
+        ->executeOne();
+      if (!$target_document) {
+        $target_document = PhrictionDocument::initializeNewDocument(
+          $viewer,
+          $v_slug);
+      }
       try {
         $editor->applyTransactions($target_document, $xactions);
         $redir_uri = PhrictionDocument::getSlugURI(
           $target_document->getSlug());
         return id(new AphrontRedirectResponse())->setURI($redir_uri);
       } catch (PhabricatorApplicationTransactionValidationException $ex) {
         $validation_exception = $ex;
         $e_slug = $ex->getShortMessage(PhrictionTransaction::TYPE_MOVE_TO);
       }
     }
 
 
     $form = id(new AphrontFormView())
       ->setUser($viewer)
       ->appendChild(
         id(new AphrontFormStaticControl())
           ->setLabel(pht('Title'))
           ->setValue($document->getContent()->getTitle()))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Current Path'))
           ->setDisabled(true)
           ->setValue($slug))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('New Path'))
           ->setValue($v_slug)
           ->setError($e_slug)
           ->setName('slug'))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Edit Notes'))
           ->setValue($v_note)
           ->setName('description'));
 
     return $this->newDialog()
       ->setTitle(pht('Move Document'))
       ->setValidationException($validation_exception)
       ->appendForm($form)
       ->addSubmitButton(pht('Move Document'))
       ->addCancelButton($cancel_uri);
   }
 
 }
diff --git a/src/applications/phriction/editor/PhrictionTransactionEditor.php b/src/applications/phriction/editor/PhrictionTransactionEditor.php
index f0606c65a4..af238dfcf9 100644
--- a/src/applications/phriction/editor/PhrictionTransactionEditor.php
+++ b/src/applications/phriction/editor/PhrictionTransactionEditor.php
@@ -1,819 +1,821 @@
 <?php
 
 final class PhrictionTransactionEditor
   extends PhabricatorApplicationTransactionEditor {
 
   const VALIDATE_CREATE_ANCESTRY = 'create';
   const VALIDATE_MOVE_ANCESTRY   = 'move';
 
   private $description;
   private $oldContent;
   private $newContent;
   private $moveAwayDocument;
   private $skipAncestorCheck;
   private $contentVersion;
   private $processContentVersionError = true;
   private $contentDiffURI;
 
   public function setDescription($description) {
     $this->description = $description;
     return $this;
   }
 
   private function getDescription() {
     return $this->description;
   }
 
   private function setOldContent(PhrictionContent $content) {
     $this->oldContent = $content;
     return $this;
   }
 
   private function getOldContent() {
     return $this->oldContent;
   }
 
   private function setNewContent(PhrictionContent $content) {
     $this->newContent = $content;
     return $this;
   }
 
   private function getNewContent() {
     return $this->newContent;
   }
 
   public function setSkipAncestorCheck($bool) {
     $this->skipAncestorCheck = $bool;
     return $this;
   }
 
   public function getSkipAncestorCheck() {
     return $this->skipAncestorCheck;
   }
 
   public function setContentVersion($version) {
     $this->contentVersion = $version;
     return $this;
   }
 
   public function getContentVersion() {
     return $this->contentVersion;
   }
 
   public function setProcessContentVersionError($process) {
     $this->processContentVersionError = $process;
     return $this;
   }
 
   public function getProcessContentVersionError() {
     return $this->processContentVersionError;
   }
 
   public function getEditorApplicationClass() {
     return 'PhabricatorPhrictionApplication';
   }
 
   public function getEditorObjectsDescription() {
     return pht('Phriction Documents');
   }
 
   public function getTransactionTypes() {
     $types = parent::getTransactionTypes();
 
     $types[] = PhrictionTransaction::TYPE_TITLE;
     $types[] = PhrictionTransaction::TYPE_CONTENT;
     $types[] = PhrictionTransaction::TYPE_DELETE;
     $types[] = PhrictionTransaction::TYPE_MOVE_TO;
     $types[] = PhrictionTransaction::TYPE_MOVE_AWAY;
 
     $types[] = PhabricatorTransactions::TYPE_EDGE;
     $types[] = PhabricatorTransactions::TYPE_COMMENT;
     $types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
     $types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;
 
     return $types;
   }
 
   protected function getCustomTransactionOldValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PhrictionTransaction::TYPE_TITLE:
         if ($this->getIsNewObject()) {
           return null;
         }
         return $this->getOldContent()->getTitle();
       case PhrictionTransaction::TYPE_CONTENT:
         if ($this->getIsNewObject()) {
           return null;
         }
         return $this->getOldContent()->getContent();
       case PhrictionTransaction::TYPE_DELETE:
       case PhrictionTransaction::TYPE_MOVE_TO:
       case PhrictionTransaction::TYPE_MOVE_AWAY:
         return null;
     }
   }
 
   protected function getCustomTransactionNewValue(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PhrictionTransaction::TYPE_TITLE:
       case PhrictionTransaction::TYPE_CONTENT:
       case PhrictionTransaction::TYPE_DELETE:
         return $xaction->getNewValue();
       case PhrictionTransaction::TYPE_MOVE_TO:
         $document = $xaction->getNewValue();
         // grab the real object now for the sub-editor to come
         $this->moveAwayDocument = $document;
         $dict = array(
           'id' => $document->getID(),
           'phid' => $document->getPHID(),
           'content' => $document->getContent()->getContent(),
           'title' => $document->getContent()->getTitle(),
         );
         return $dict;
       case PhrictionTransaction::TYPE_MOVE_AWAY:
         $document = $xaction->getNewValue();
         $dict = array(
           'id' => $document->getID(),
           'phid' => $document->getPHID(),
           'content' => $document->getContent()->getContent(),
           'title' => $document->getContent()->getTitle(),
         );
         return $dict;
     }
   }
 
   protected function shouldApplyInitialEffects(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     foreach ($xactions as $xaction) {
       switch ($xaction->getTransactionType()) {
       case PhrictionTransaction::TYPE_TITLE:
       case PhrictionTransaction::TYPE_CONTENT:
       case PhrictionTransaction::TYPE_DELETE:
       case PhrictionTransaction::TYPE_MOVE_TO:
       case PhrictionTransaction::TYPE_MOVE_AWAY:
         return true;
       }
     }
     return parent::shouldApplyInitialEffects($object, $xactions);
   }
 
   protected function applyInitialEffects(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $this->setOldContent($object->getContent());
     $this->setNewContent($this->buildNewContentTemplate($object));
   }
 
   protected function applyCustomInternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PhrictionTransaction::TYPE_TITLE:
       case PhrictionTransaction::TYPE_CONTENT:
       case PhrictionTransaction::TYPE_MOVE_TO:
         $object->setStatus(PhrictionDocumentStatus::STATUS_EXISTS);
         return;
       case PhrictionTransaction::TYPE_MOVE_AWAY:
         $object->setStatus(PhrictionDocumentStatus::STATUS_MOVED);
         return;
       case PhrictionTransaction::TYPE_DELETE:
         $object->setStatus(PhrictionDocumentStatus::STATUS_DELETED);
         return;
     }
   }
 
   protected function expandTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     $xactions = parent::expandTransaction($object, $xaction);
     switch ($xaction->getTransactionType()) {
       case PhrictionTransaction::TYPE_CONTENT:
         if ($this->getIsNewObject()) {
           break;
         }
         $content = $xaction->getNewValue();
         if ($content === '') {
           $xactions[] = id(new PhrictionTransaction())
             ->setTransactionType(PhrictionTransaction::TYPE_DELETE)
             ->setNewValue(true)
             ->setMetadataValue('contentDelete', true);
         }
         break;
       case PhrictionTransaction::TYPE_MOVE_TO:
         $document = $xaction->getNewValue();
         $xactions[] = id(new PhrictionTransaction())
           ->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
           ->setNewValue($document->getViewPolicy());
         $xactions[] = id(new PhrictionTransaction())
           ->setTransactionType(PhabricatorTransactions::TYPE_EDIT_POLICY)
           ->setNewValue($document->getEditPolicy());
         break;
       default:
         break;
 
     }
 
     return $xactions;
   }
 
   protected function applyCustomExternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     switch ($xaction->getTransactionType()) {
       case PhrictionTransaction::TYPE_TITLE:
         $this->getNewContent()->setTitle($xaction->getNewValue());
         break;
       case PhrictionTransaction::TYPE_CONTENT:
         $this->getNewContent()->setContent($xaction->getNewValue());
         break;
       case PhrictionTransaction::TYPE_DELETE:
         $this->getNewContent()->setContent('');
         $this->getNewContent()->setChangeType(
           PhrictionChangeType::CHANGE_DELETE);
         break;
       case PhrictionTransaction::TYPE_MOVE_TO:
         $dict = $xaction->getNewValue();
         $this->getNewContent()->setContent($dict['content']);
         $this->getNewContent()->setTitle($dict['title']);
         $this->getNewContent()->setChangeType(
           PhrictionChangeType::CHANGE_MOVE_HERE);
         $this->getNewContent()->setChangeRef($dict['id']);
         break;
       case PhrictionTransaction::TYPE_MOVE_AWAY:
         $dict = $xaction->getNewValue();
         $this->getNewContent()->setContent('');
         $this->getNewContent()->setChangeType(
           PhrictionChangeType::CHANGE_MOVE_AWAY);
         $this->getNewContent()->setChangeRef($dict['id']);
         break;
       default:
         break;
     }
   }
 
   protected function applyFinalEffects(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $save_content = false;
     foreach ($xactions as $xaction) {
       switch ($xaction->getTransactionType()) {
         case PhrictionTransaction::TYPE_TITLE:
         case PhrictionTransaction::TYPE_CONTENT:
         case PhrictionTransaction::TYPE_DELETE:
         case PhrictionTransaction::TYPE_MOVE_AWAY:
         case PhrictionTransaction::TYPE_MOVE_TO:
           $save_content = true;
           break;
         default:
           break;
       }
     }
 
     if ($save_content) {
       $content = $this->getNewContent();
       $content->setDocumentID($object->getID());
       $content->save();
 
       $object->setContentID($content->getID());
       $object->save();
       $object->attachContent($content);
     }
 
     if ($this->getIsNewObject() && !$this->getSkipAncestorCheck()) {
       // Stub out empty parent documents if they don't exist
       $ancestral_slugs = PhabricatorSlug::getAncestry($object->getSlug());
       if ($ancestral_slugs) {
         $ancestors = id(new PhrictionDocumentQuery())
           ->setViewer(PhabricatorUser::getOmnipotentUser())
           ->withSlugs($ancestral_slugs)
           ->needContent(true)
           ->execute();
         $ancestors = mpull($ancestors, null, 'getSlug');
         $stub_type = PhrictionChangeType::CHANGE_STUB;
         foreach ($ancestral_slugs as $slug) {
           $ancestor_doc = idx($ancestors, $slug);
           // We check for change type to prevent near-infinite recursion
           if (!$ancestor_doc && $content->getChangeType() != $stub_type) {
             $ancestor_doc = PhrictionDocument::initializeNewDocument(
               $this->getActor(),
               $slug);
             $stub_xactions = array();
             $stub_xactions[] = id(new PhrictionTransaction())
               ->setTransactionType(PhrictionTransaction::TYPE_TITLE)
               ->setNewValue(PhabricatorSlug::getDefaultTitle($slug))
               ->setMetadataValue('stub:create:phid', $object->getPHID());
             $stub_xactions[] = id(new PhrictionTransaction())
               ->setTransactionType(PhrictionTransaction::TYPE_CONTENT)
               ->setNewValue('')
               ->setMetadataValue('stub:create:phid', $object->getPHID());
             $stub_xactions[] = id(new PhrictionTransaction())
               ->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
               ->setNewValue($object->getViewPolicy());
             $stub_xactions[] = id(new PhrictionTransaction())
               ->setTransactionType(PhabricatorTransactions::TYPE_EDIT_POLICY)
               ->setNewValue($object->getEditPolicy());
             $sub_editor = id(new PhrictionTransactionEditor())
               ->setActor($this->getActor())
               ->setContentSource($this->getContentSource())
               ->setContinueOnNoEffect($this->getContinueOnNoEffect())
               ->setSkipAncestorCheck(true)
               ->setDescription(pht('Empty Parent Document'))
               ->applyTransactions($ancestor_doc, $stub_xactions);
           }
         }
       }
     }
 
     if ($this->moveAwayDocument !== null) {
       $move_away_xactions = array();
       $move_away_xactions[] = id(new PhrictionTransaction())
         ->setTransactionType(PhrictionTransaction::TYPE_MOVE_AWAY)
         ->setNewValue($object);
       $sub_editor = id(new PhrictionTransactionEditor())
         ->setActor($this->getActor())
         ->setContentSource($this->getContentSource())
         ->setContinueOnNoEffect($this->getContinueOnNoEffect())
         ->setDescription($this->getDescription())
         ->applyTransactions($this->moveAwayDocument, $move_away_xactions);
     }
 
     // Compute the content diff URI for the publishing phase.
     foreach ($xactions as $xaction) {
       switch ($xaction->getTransactionType()) {
         case PhrictionTransaction::TYPE_CONTENT:
           $uri = id(new PhutilURI('/phriction/diff/'.$object->getID().'/'))
             ->alter('l', $this->getOldContent()->getVersion())
             ->alter('r', $this->getNewContent()->getVersion());
           $this->contentDiffURI = (string)$uri;
           break 2;
         default:
           break;
       }
     }
 
     return $xactions;
   }
 
   protected function shouldSendMail(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return true;
   }
 
   protected function getMailSubjectPrefix() {
     return '[Phriction]';
   }
 
   protected function getMailTo(PhabricatorLiskDAO $object) {
     return array(
       $object->getContent()->getAuthorPHID(),
       $this->getActingAsPHID(),
     );
   }
 
   public function getMailTagsMap() {
     return array(
       PhrictionTransaction::MAILTAG_TITLE =>
         pht("A document's title changes."),
       PhrictionTransaction::MAILTAG_CONTENT =>
         pht("A document's content changes."),
       PhrictionTransaction::MAILTAG_DELETE =>
         pht('A document is deleted.'),
       PhrictionTransaction::MAILTAG_SUBSCRIBERS =>
         pht('A document\'s subscribers change.'),
       PhrictionTransaction::MAILTAG_OTHER =>
         pht('Other document activity not listed above occurs.'),
     );
   }
 
   protected function buildReplyHandler(PhabricatorLiskDAO $object) {
     return id(new PhrictionReplyHandler())
       ->setMailReceiver($object);
   }
 
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
     $id = $object->getID();
     $title = $object->getContent()->getTitle();
 
     return id(new PhabricatorMetaMTAMail())
       ->setSubject($title)
       ->addHeader('Thread-Topic', $object->getPHID());
   }
 
   protected function buildMailBody(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $body = parent::buildMailBody($object, $xactions);
 
     if ($this->getIsNewObject()) {
       $body->addRemarkupSection(
         pht('DOCUMENT CONTENT'),
         $object->getContent()->getContent());
     } else if ($this->contentDiffURI) {
       $body->addLinkSection(
         pht('DOCUMENT DIFF'),
         PhabricatorEnv::getProductionURI($this->contentDiffURI));
     }
 
     $description = $object->getContent()->getDescription();
     if (strlen($description)) {
       $body->addTextSection(
         pht('EDIT NOTES'),
         $description);
     }
 
     $body->addLinkSection(
       pht('DOCUMENT DETAIL'),
       PhabricatorEnv::getProductionURI(
         PhrictionDocument::getSlugURI($object->getSlug())));
 
     return $body;
   }
 
   protected function shouldPublishFeedStory(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return $this->shouldSendMail($object, $xactions);
   }
 
   protected function getFeedRelatedPHIDs(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     $phids = parent::getFeedRelatedPHIDs($object, $xactions);
 
     foreach ($xactions as $xaction) {
       switch ($xaction->getTransactionType()) {
         case PhrictionTransaction::TYPE_MOVE_TO:
           $dict = $xaction->getNewValue();
           $phids[] = $dict['phid'];
           break;
       }
     }
 
     return $phids;
   }
 
   protected function validateTransaction(
     PhabricatorLiskDAO $object,
     $type,
     array $xactions) {
 
     $errors = parent::validateTransaction($object, $type, $xactions);
 
     foreach ($xactions as $xaction) {
       switch ($type) {
         case PhrictionTransaction::TYPE_TITLE:
           $title = $object->getContent()->getTitle();
           $missing = $this->validateIsEmptyTextField(
             $title,
             $xactions);
 
           if ($missing) {
             $error = new PhabricatorApplicationTransactionValidationError(
               $type,
               pht('Required'),
               pht('Document title is required.'),
               nonempty(last($xactions), null));
 
             $error->setIsMissingFieldError(true);
             $errors[] = $error;
           } else if ($this->getProcessContentVersionError()) {
             $error = $this->validateContentVersion($object, $type, $xaction);
             if ($error) {
               $this->setProcessContentVersionError(false);
               $errors[] = $error;
             }
           }
           break;
 
         case PhrictionTransaction::TYPE_CONTENT:
           if ($xaction->getMetadataValue('stub:create:phid')) {
             continue;
           }
 
           $missing = false;
           if ($this->getIsNewObject()) {
             $content = $object->getContent()->getContent();
             $missing = $this->validateIsEmptyTextField(
               $content,
               $xactions);
           }
 
           if ($missing) {
             $error = new PhabricatorApplicationTransactionValidationError(
               $type,
               pht('Required'),
               pht('Document content is required.'),
               nonempty(last($xactions), null));
 
             $error->setIsMissingFieldError(true);
             $errors[] = $error;
           } else if ($this->getProcessContentVersionError()) {
             $error = $this->validateContentVersion($object, $type, $xaction);
             if ($error) {
               $this->setProcessContentVersionError(false);
               $errors[] = $error;
             }
           }
 
           if ($this->getIsNewObject()) {
             $ancestry_errors = $this->validateAncestry(
               $object,
               $type,
               $xaction,
               self::VALIDATE_CREATE_ANCESTRY);
             if ($ancestry_errors) {
               $errors = array_merge($errors, $ancestry_errors);
             }
           }
 
           break;
 
         case PhrictionTransaction::TYPE_MOVE_TO:
           $source_document = $xaction->getNewValue();
           switch ($source_document->getStatus()) {
             case PhrictionDocumentStatus::STATUS_DELETED:
               $e_text = pht('A deleted document can not be moved.');
               break;
             case PhrictionDocumentStatus::STATUS_MOVED:
               $e_text = pht('A moved document can not be moved again.');
               break;
             case PhrictionDocumentStatus::STATUS_STUB:
               $e_text = pht('A stub document can not be moved.');
               break;
             default:
               $e_text = null;
               break;
           }
 
           if ($e_text) {
             $error = new PhabricatorApplicationTransactionValidationError(
               $type,
               pht('Can not move document.'),
               $e_text,
               $xaction);
             $errors[] = $error;
           }
 
           $ancestry_errors = $this->validateAncestry(
             $object,
             $type,
             $xaction,
             self::VALIDATE_MOVE_ANCESTRY);
           if ($ancestry_errors) {
             $errors = array_merge($errors, $ancestry_errors);
           }
 
           $target_document = id(new PhrictionDocumentQuery())
             ->setViewer(PhabricatorUser::getOmnipotentUser())
             ->withSlugs(array($object->getSlug()))
             ->needContent(true)
             ->executeOne();
 
           // Prevent overwrites and no-op moves.
           $exists = PhrictionDocumentStatus::STATUS_EXISTS;
           if ($target_document) {
+            $message = null;
             if ($target_document->getSlug() == $source_document->getSlug()) {
               $message = pht(
                 'You can not move a document to its existing location. '.
                 'Choose a different location to move the document to.');
             } else if ($target_document->getStatus() == $exists) {
               $message = pht(
                 'You can not move this document there, because it would '.
                 'overwrite an existing document which is already at that '.
                 'location. Move or delete the existing document first.');
             }
-
-            $error = new PhabricatorApplicationTransactionValidationError(
-              $type,
-              pht('Invalid'),
-              $message,
-              $xaction);
-            $errors[] = $error;
+            if ($message !== null) {
+              $error = new PhabricatorApplicationTransactionValidationError(
+                $type,
+                pht('Invalid'),
+                $message,
+                $xaction);
+              $errors[] = $error;
+            }
           }
           break;
 
         case PhrictionTransaction::TYPE_DELETE:
           switch ($object->getStatus()) {
             case PhrictionDocumentStatus::STATUS_DELETED:
               if ($xaction->getMetadataValue('contentDelete')) {
                 $e_text = pht(
                   'This document is already deleted. You must specify '.
                   'content to re-create the document and make further edits.');
               } else {
                 $e_text = pht(
                   'An already deleted document can not be deleted.');
               }
               break;
             case PhrictionDocumentStatus::STATUS_MOVED:
               $e_text = pht('A moved document can not be deleted.');
               break;
             case PhrictionDocumentStatus::STATUS_STUB:
               $e_text = pht('A stub document can not be deleted.');
               break;
             default:
               break 2;
           }
 
           $error = new PhabricatorApplicationTransactionValidationError(
             $type,
             pht('Can not delete document.'),
             $e_text,
             $xaction);
           $errors[] = $error;
           break;
       }
     }
 
     return $errors;
   }
 
   private function validateAncestry(
     PhabricatorLiskDAO $object,
     $type,
     PhabricatorApplicationTransaction $xaction,
     $verb) {
 
     $errors = array();
     // NOTE: We use the ominpotent user for these checks because policy
     // doesn't matter; existence does.
     $other_doc_viewer = PhabricatorUser::getOmnipotentUser();
     $ancestral_slugs = PhabricatorSlug::getAncestry($object->getSlug());
     if ($ancestral_slugs) {
       $ancestors = id(new PhrictionDocumentQuery())
         ->setViewer($other_doc_viewer)
         ->withSlugs($ancestral_slugs)
         ->execute();
       $ancestors = mpull($ancestors, null, 'getSlug');
       foreach ($ancestral_slugs as $slug) {
         $ancestor_doc = idx($ancestors, $slug);
         if (!$ancestor_doc) {
           $create_uri = '/phriction/edit/?slug='.$slug;
           $create_link = phutil_tag(
             'a',
             array(
               'href' => $create_uri,
             ),
             $slug);
           switch ($verb) {
             case self::VALIDATE_MOVE_ANCESTRY:
               $message = pht(
                 'Can not move document because the parent document with '.
                 'slug %s does not exist!',
                 $create_link);
               break;
             case self::VALIDATE_CREATE_ANCESTRY:
               $message = pht(
                 'Can not create document because the parent document with '.
                 'slug %s does not exist!',
                 $create_link);
               break;
           }
           $error = new PhabricatorApplicationTransactionValidationError(
             $type,
             pht('Missing Ancestor'),
             $message,
             $xaction);
           $errors[] = $error;
         }
       }
     }
     return $errors;
   }
 
   private function validateContentVersion(
     PhabricatorLiskDAO $object,
     $type,
     PhabricatorApplicationTransaction $xaction) {
 
     $error = null;
     if ($this->getContentVersion() &&
        ($object->getContent()->getVersion() != $this->getContentVersion())) {
       $error = new PhabricatorApplicationTransactionValidationError(
         $type,
         pht('Edit Conflict'),
         pht(
           'Another user made changes to this document after you began '.
           'editing it. Do you want to overwrite their changes? '.
           '(If you choose to overwrite their changes, you should review '.
           'the document edit history to see what you overwrote, and '.
           'then make another edit to merge the changes if necessary.)'),
         $xaction);
     }
     return $error;
   }
   protected function requireCapabilities(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
     /*
      * New objects have a special case. If a user can't see
      *   x/y
      * then definitely don't let them make some
      *   x/y/z
      * We need to load the direct parent to handle this case.
      */
     if ($this->getIsNewObject()) {
       $actor = $this->requireActor();
       $parent_doc = null;
       $ancestral_slugs = PhabricatorSlug::getAncestry($object->getSlug());
       // No ancestral slugs is "/"; the first person gets to play with "/".
       if ($ancestral_slugs) {
         $parent = end($ancestral_slugs);
         $parent_doc = id(new PhrictionDocumentQuery())
           ->setViewer($actor)
           ->withSlugs(array($parent))
           ->executeOne();
         // If the $actor can't see the $parent_doc then they can't create
         // the child $object; throw a policy exception.
         if (!$parent_doc) {
           id(new PhabricatorPolicyFilter())
             ->setViewer($actor)
             ->raisePolicyExceptions(true)
             ->rejectObject(
               $object,
               $object->getEditPolicy(),
               PhabricatorPolicyCapability::CAN_EDIT);
         }
 
         // If the $actor can't edit the $parent_doc then they can't create
         // the child $object; throw a policy exception.
         if (!PhabricatorPolicyFilter::hasCapability(
           $actor,
           $parent_doc,
           PhabricatorPolicyCapability::CAN_EDIT)) {
           id(new PhabricatorPolicyFilter())
             ->setViewer($actor)
             ->raisePolicyExceptions(true)
             ->rejectObject(
               $object,
               $object->getEditPolicy(),
               PhabricatorPolicyCapability::CAN_EDIT);
         }
       }
     }
     return parent::requireCapabilities($object, $xaction);
   }
 
   protected function supportsSearch() {
     return true;
   }
 
   protected function shouldApplyHeraldRules(
     PhabricatorLiskDAO $object,
     array $xactions) {
     return true;
   }
 
   protected function buildHeraldAdapter(
     PhabricatorLiskDAO $object,
     array $xactions) {
 
     return id(new PhrictionDocumentHeraldAdapter())
       ->setDocument($object);
   }
 
   private function buildNewContentTemplate(
     PhrictionDocument $document) {
 
     $new_content = id(new PhrictionContent())
       ->setSlug($document->getSlug())
       ->setAuthorPHID($this->getActor()->getPHID())
       ->setChangeType(PhrictionChangeType::CHANGE_EDIT)
       ->setTitle($this->getOldContent()->getTitle())
       ->setContent($this->getOldContent()->getContent());
     if (strlen($this->getDescription())) {
       $new_content->setDescription($this->getDescription());
     }
     $new_content->setVersion($this->getOldContent()->getVersion() + 1);
 
     return $new_content;
   }
 
   protected function getCustomWorkerState() {
     return array(
       'contentDiffURI' => $this->contentDiffURI,
     );
   }
 
   protected function loadCustomWorkerState(array $state) {
     $this->contentDiffURI = idx($state, 'contentDiffURI');
     return $this;
   }
 
 }