diff --git a/src/codegen/keycode.rs b/src/codegen/keycode.rs
index 7559bb80ba8..75728c1000f 100644
--- a/src/codegen/keycode.rs
+++ b/src/codegen/keycode.rs
@@ -330,7 +330,7 @@ impl ToPrimitive for KeyCode {
     for primitive_type in types.iter() {
         out.write(format!("fn to_{}(&self) -> Option<{}> \\{
             Some(self.code() as {})
-        \\}\n", *primitive_type, *primitive_type, *primitive_type).into_bytes())
+        \\}\n", *primitive_type, *primitive_type, *primitive_type).into_bytes());
     }
 
 out.write("
diff --git a/src/codegen/main.rs b/src/codegen/main.rs
index 802ff1a326f..20cd469017a 100644
--- a/src/codegen/main.rs
+++ b/src/codegen/main.rs
@@ -42,7 +42,7 @@ fn main() {
 
 pub fn get_writer(output_dir: &Path, filename: &str) -> ~BufferedWriter<File> {
     match File::open_mode(&output_dir.join(filename), io::Truncate, io::Write) {
-        Some(writer) => ~BufferedWriter::new(writer),
-        None => fail!("Unable to write file"),
+        Ok(writer) => ~BufferedWriter::new(writer),
+        Err(e) => fail!("Unable to write file: {:s}", e.desc),
     }
 }
diff --git a/src/codegen/scancode.rs b/src/codegen/scancode.rs
index a952bcbd4af..4efb3de9030 100644
--- a/src/codegen/scancode.rs
+++ b/src/codegen/scancode.rs
@@ -339,7 +339,7 @@ impl ToPrimitive for ScanCode {
     for primitive_type in types.iter() {
         out.write(format!("fn to_{}(&self) -> Option<{}> \\{
             Some(self.code() as {})
-        \\}\n", *primitive_type, *primitive_type, *primitive_type).into_bytes())
+        \\}\n", *primitive_type, *primitive_type, *primitive_type).into_bytes());
     }
 
 out.write("