diff --git a/src/editor-view.coffee b/src/editor-view.coffee
index fb1540d61..67a5d3ce7 100644
--- a/src/editor-view.coffee
+++ b/src/editor-view.coffee
@@ -780,6 +780,14 @@ class EditorView extends View
 
   afterAttach: (onDom) ->
     return unless onDom
+
+    # TODO: Remove this guard when we understand why this is happening
+    unless @editor.isAlive()
+      if atom.isReleasedVersion()
+        return
+      else
+        throw new Error("Assertion failure: EditorView is getting attached to a dead editor. Why?")
+
     @redraw() if @redrawOnReattach
     return if @attached
     @attached = true