2 files changed, 9 insertions, 3 deletions
diff --git a/crates/shirabe/src/console/input/input_argument.rs b/crates/shirabe/src/console/input/input_argument.rs
index 458ec61..81f38ac 100644
--- a/crates/shirabe/src/console/input/input_argument.rs
+++ b/crates/shirabe/src/console/input/input_argument.rs
@@ -21,7 +21,12 @@ impl InputArgument {
         default: Option<PhpMixed>,
         // TODO(cli-completion): suggested_values closure / list dropped along with completion support
     ) -> Result<Self> {
-        let inner = BaseInputArgument::new(name, mode, description, default);
+        let inner = BaseInputArgument::new(
+            name.to_string(),
+            mode,
+            description.to_string(),
+            default.unwrap_or(PhpMixed::Null),
+        )?;
         Ok(Self { inner })
     }
 }
diff --git a/crates/shirabe/src/console/input/input_option.rs b/crates/shirabe/src/console/input/input_option.rs
index 92c4a51..3298be0 100644
--- a/crates/shirabe/src/console/input/input_option.rs
+++ b/crates/shirabe/src/console/input/input_option.rs
@@ -24,9 +24,10 @@ impl InputOption {
         default: Option<PhpMixed>,
         // TODO(cli-completion): suggested_values closure / list dropped along with completion support
     ) -> Result<Self> {
-        let shortcut_str = shortcut.as_ref().and_then(|s| s.as_string());
+        let shortcut = shortcut.unwrap_or(PhpMixed::Null);
         let default_mixed = default.unwrap_or(PhpMixed::Null);
-        let inner = BaseInputOption::new(name, shortcut_str, mode, description, default_mixed);
+        let inner =
+            BaseInputOption::new(name, shortcut, mode, description.to_string(), default_mixed)?;
         Ok(Self { inner })
     }
 }