diff --git a/src/uu/base32/src/base_common.rs b/src/uu/base32/src/base_common.rs
index ee5fe8675..256b674e2 100644
--- a/src/uu/base32/src/base_common.rs
+++ b/src/uu/base32/src/base_common.rs
@@ -54,15 +54,13 @@ impl Config {
             None => None,
         };
 
-        let cols = match options.value_of(options::WRAP) {
-            Some(num) => match num.parse::<usize>() {
-                Ok(n) => Some(n),
-                Err(e) => {
-                    return Err(format!("Invalid wrap size: ‘{}’: {}", num, e));
-                }
-            },
-            None => None,
-        };
+        let cols = options
+            .value_of(options::WRAP)
+            .map(|num| {
+                num.parse::<usize>()
+                    .map_err(|e| format!("Invalid wrap size: ‘{}’: {}", num, e))
+            })
+            .transpose()?;
 
         Ok(Config {
             decode: options.is_present(options::DECODE),