3 files changed, 8 insertions, 5 deletions
diff --git a/components/net/about_loader.rs b/components/net/about_loader.rs
index 4eca1d7819a..27824d89a1f 100644
--- a/components/net/about_loader.rs
+++ b/components/net/about_loader.rs
@@ -19,7 +19,7 @@ pub fn factory(mut load_data: LoadData, start_chan: Sender<LoadResponse>) {
                 content_type: Some(("text".to_string(), "html".to_string())),
                 charset: Some("utf-8".to_string()),
                 headers: None,
-                status: StatusOk,
+                status: Some(StatusOk),
             });
             chan.send(Done(Ok(())));
             return
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index 787375d5306..50327f3a00c 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -17,7 +17,10 @@ pub fn factory(load_data: LoadData, start_chan: Sender<LoadResponse>) {
 }
 
 fn send_error(url: Url, err: String, start_chan: Sender<LoadResponse>) {
-    match start_sending_opt(start_chan, Metadata::default(url)) {
+    let mut metadata = Metadata::default(url);
+    metadata.status = None;
+
+    match start_sending_opt(start_chan, metadata) {
         Ok(p) => p.send(Done(Err(err))),
         _ => {}
     };
@@ -133,7 +136,7 @@ fn load(load_data: LoadData, start_chan: Sender<LoadResponse>) {
         let mut metadata = Metadata::default(url);
         metadata.set_content_type(&response.headers.content_type);
         metadata.headers = Some(response.headers.clone());
-        metadata.status = response.status.clone();
+        metadata.status = Some(response.status.clone());
 
         let progress_chan = match start_sending_opt(start_chan, metadata) {
             Ok(p) => p,
diff --git a/components/net/resource_task.rs b/components/net/resource_task.rs
index 802b44afd75..74d8d1b959d 100644
--- a/components/net/resource_task.rs
+++ b/components/net/resource_task.rs
@@ -72,7 +72,7 @@ pub struct Metadata {
     pub headers: Option<ResponseHeaderCollection>,
 
     /// HTTP Status
-    pub status: Status
+    pub status: Option<Status>
 }
 
 impl Metadata {
@@ -83,7 +83,7 @@ impl Metadata {
             content_type: None,
             charset:      None,
             headers: None,
-            status: StatusOk // http://fetch.spec.whatwg.org/#concept-response-status-message
+            status: Some(StatusOk) // http://fetch.spec.whatwg.org/#concept-response-status-message
         }
     }