diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
index 3e5f16817a8d..86e5bbeab706 100644
--- a/src/librustdoc/core.rs
+++ b/src/librustdoc/core.rs
@@ -596,6 +596,8 @@ pub fn run_core(search_paths: SearchPaths,
                 }
             }
 
+            ctxt.sess().abort_if_errors();
+
             (krate, ctxt.renderinfo.into_inner(), passes)
         }), &sess)
     })
diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs
index b76168f7b741..28d504c2ee0c 100644
--- a/src/librustdoc/passes/collect_intra_doc_links.rs
+++ b/src/librustdoc/passes/collect_intra_doc_links.rs
@@ -379,8 +379,6 @@ impl<'a, 'tcx, 'rcx, 'cstore> DocFolder for LinkCollector<'a, 'tcx, 'rcx, 'cstor
             }
         }
 
-        cx.sess().abort_if_errors();
-
         if item.is_mod() && !item.attrs.inner_docs {
             self.mod_ids.push(item_node_id.unwrap());
         }