diff --git a/src/qrcode/encoder/QRCodeTestCase.rs b/src/qrcode/encoder/QRCodeTestCase.rs
index 8b01c4b..90dc953 100644
--- a/src/qrcode/encoder/QRCodeTestCase.rs
+++ b/src/qrcode/encoder/QRCodeTestCase.rs
@@ -61,13 +61,7 @@ use super::QRCode;
   fn testToString1() {
     let qrCode =  QRCode::new();
     let expected =
-        "<<\n\
- mode: null\n\
- ecLevel: null\n\
- version: null\n\
- maskPattern: -1\n\
- matrix: null\n\
->>\n";
+        "<<\n mode: null\n ecLevel: null\n version: null\n maskPattern: -1\n matrix: null\n>>\n";
         assert_eq!(expected, qrCode.to_string());
   }
 
@@ -87,32 +81,32 @@ use super::QRCode;
       }
     }
     qrCode.setMatrix(matrix);
-    let expected = "<<\n\
- mode: BYTE\n\
- ecLevel: H\n\
- version: 1\n\
- maskPattern: 3\n\
- matrix:\n\
- 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
- 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
- 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
- 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
- 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
- 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
- 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
- 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
- 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
- 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
- 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
- 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
- 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
- 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
- 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
- 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
- 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
- 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
- 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
- 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n\
+    let expected = "<<\n \
+ mode: BYTE\n \
+ ecLevel: H\n \
+ version: 1\n \
+ maskPattern: 3\n \
+ matrix:\n \
+ 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
+ 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
+ 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
+ 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
+ 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
+ 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
+ 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
+ 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
+ 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
+ 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
+ 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
+ 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
+ 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
+ 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
+ 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
+ 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
+ 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
+ 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
+ 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n \
+ 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1\n \
  0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0\n\
 >>\n";
     assert_eq!(expected, qrCode.to_string());
diff --git a/src/qrcode/encoder/qr_code.rs b/src/qrcode/encoder/qr_code.rs
index f036562..e0a4181 100644
--- a/src/qrcode/encoder/qr_code.rs
+++ b/src/qrcode/encoder/qr_code.rs
@@ -106,18 +106,36 @@ impl fmt::Display for QRCode {
       let mut result =  String::with_capacity(200);
       result.push_str("<<\n");
       result.push_str(" mode: ");
-      result.push_str(&format!("{:?}", self.mode));
+      if self.mode.is_some() {
+        result.push_str(&format!("{:?}",self.mode.as_ref().unwrap()));
+      }else {
+        result.push_str("null");
+      }
+      // result.push_str(&format!("{:?}", self.mode));
       result.push_str("\n ecLevel: ");
-      result.push_str(&format!("{:?}", self.ecLevel));
+      if self.ecLevel.is_some() {
+        result.push_str(&format!("{:?}",self.ecLevel.as_ref().unwrap()));
+      }else {
+        result.push_str("null");
+      }
+      // result.push_str(&format!("{:?}", self.ecLevel));
       result.push_str("\n version: ");
-      result.push_str(&format!("{}",self.version.as_ref().unwrap()));
+      if self.version.is_some() {
+        result.push_str(&format!("{}",self.version.as_ref().unwrap()));
+      }else {
+        result.push_str("null");
+      }
       result.push_str("\n maskPattern: ");
       result.push_str(&format!("{}",self.maskPattern));
       if self.matrix.is_none() {
         result.push_str("\n matrix: null\n");
       } else {
         result.push_str("\n matrix:\n");
-        result.push_str(&format!("{}",self.matrix.as_ref().unwrap()));
+        if self.matrix.is_some() {
+          result.push_str(&format!("{}",self.matrix.as_ref().unwrap()));
+        }else {
+          result.push_str("null");
+        }
       }
       result.push_str(">>\n");