diff --git a/CHANGELOG.md b/CHANGELOG.md
index c618445e3..1836c7efe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ Note that `browser.text` no longer preserves white space.
 
 Fixed JS execution bug that messes with require.js.
 
+Fixed failing to create empty document on HTTP error.
+
 
 ## Version 1.2.0 2012-05-28
 
diff --git a/lib/zombie/history.coffee b/lib/zombie/history.coffee
index 7bba3a581..dccf9293f 100644
--- a/lib/zombie/history.coffee
+++ b/lib/zombie/history.coffee
@@ -97,13 +97,14 @@ class History
         # Proceeed to load resource ...
         method = (method || "GET").toUpperCase()
         @_browser.resources.request method, url, data, headers, (error, response)=>
-          document = @_createDocument(@_window, response.url)
           if error
+            document = @_createDocument(@_window, url)
             document.open()
             document.write error.message
             document.close()
             @_browser.emit "error", error
           else
+            document = @_createDocument(@_window, response.url)
             @_browser.response = [response.statusCode, response.headers, response.body]
             url = URL.parse(response.url)
             @_stack[@_index].update url