diff --git a/src/r701.rs b/src/r701.rs
index 1700dff..9b49ce4 100644
--- a/src/r701.rs
+++ b/src/r701.rs
@@ -65,26 +65,28 @@ impl R701 {
 
         // If the response length is right but the header is `01 00 00 00 00 00
         // 00 00` then the request is been succesful but the name was not found
-        if response[..12] == [0xaa, 0x55, 0x01, 0, 0, 0, 0, 0, 0, 0, 0x55, 0xaa]
-            && response.len() == 34
+        if response.len() == 34
+            && response[..12] == [0xaa, 0x55, 0x01, 0, 0, 0, 0, 0, 0, 0, 0x55, 0xaa]
         {
             return Ok(None);
         }
 
         // If one between the response length or the response header is wrong
         // return an error
-        if response[..12] != [0xaa, 0x55, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x55, 0xaa]
-            || response.len() != 34
+        if response.len() != 34
+            || response[..12] != [0xaa, 0x55, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x55, 0xaa]
         {
             return Err(Error::new(InvalidData, "Malformed response"));
         }
 
         // Get the name as a UTF-8 string and delete the `\0` at the end
-        Ok(Some(
-            String::from_utf8_lossy(&response[12..22])
-                .trim_end_matches(char::from(0))
-                .to_string(),
-        ))
+        let name = String::from_utf8_lossy(&response[12..22])
+            .trim_end_matches('\0')
+            .to_string();
+
+        // Return None if the name is empty, else return the name wrapped into a
+        // Some
+        Ok(Some(name).filter(|name| !name.is_empty()))
     }
 
     pub fn get_total_record_count(&mut self) -> Result<u16> {
@@ -94,9 +96,9 @@ impl R701 {
 
         // If one between the response length or the response header is wrong
         // return an error
-        if response[..4] != [0xaa, 0x55, 0x01, 0x01]
+        if response.len() != 10
+            || response[..4] != [0xaa, 0x55, 0x01, 0x01]
             || response[6..] != [0u8; 4]
-            || response.len() != 10
         {
             return Err(Error::new(InvalidData, "Malformed response"));
         }
@@ -133,15 +135,15 @@ impl R701 {
 
         // If one between the response length, the response header or the last
         // two bits is wrong return an error
-        if response[..12] != [0xaa, 0x55, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x55, 0xaa]
+        if response.len() != 1038
+            || response[..12] != [0xaa, 0x55, 0x01, 0x01, 0, 0, 0, 0, 0, 0, 0x55, 0xaa]
             || response[1036..] != [0, 0]
-            || response.len() != 1038
         {
             return Err(Error::new(InvalidData, "Malformed response"));
         }
 
         // Return only the payload bits as a vector
-        Ok(response[12..response.len() - 2].to_vec())
+        Ok(response[12..1036].to_vec())
     }
 
     pub fn iter(&mut self) -> Result<RecordIterator> {