1 files changed, 2 insertions, 2 deletions
diff --git a/components/net/data_loader.rs b/components/net/data_loader.rs
index 3d3736ea404..987b39568f3 100644
--- a/components/net/data_loader.rs
+++ b/components/net/data_loader.rs
@@ -5,7 +5,7 @@
 use resource_task::{Metadata, LoadData, TargetedLoadResponse, start_sending, ResponseSenders};
 use resource_task::ProgressMsg::{Payload, Done};
 
-use rustc_serialize::base64::FromBase64;
+use serialize::base64::FromBase64;
 
 use hyper::mime::Mime;
 use url::{percent_decode, SchemeData};
@@ -60,7 +60,7 @@ fn load(load_data: LoadData, start_chan: Sender<TargetedLoadResponse>) {
 
     // Parse the content type using rust-http.
     // FIXME: this can go into an infinite loop! (rust-http #25)
-    let content_type: Option<Mime> = ct_str.parse();
+    let content_type: Option<Mime> = ct_str.parse().ok();
     metadata.set_content_type(content_type.as_ref());
 
     let progress_chan = start_sending(senders, metadata);