diff --git a/src/uu/stty/src/stty.rs b/src/uu/stty/src/stty.rs
index 589d2adad..fdeee252d 100644
--- a/src/uu/stty/src/stty.rs
+++ b/src/uu/stty/src/stty.rs
@@ -404,7 +404,7 @@ fn stty(opts: &Options) -> UResult<()> {
         }
 
         // TODO: Figure out the right error message for when tcgetattr fails
-        let mut termios = tcgetattr(opts.file.as_fd()).expect("Could not get terminal attributes");
+        let mut termios = tcgetattr(opts.file.as_fd())?;
 
         // iterate over valid_args, match on the arg type, do the matching apply function
         for arg in &valid_args {
@@ -419,12 +419,11 @@ fn stty(opts: &Options) -> UResult<()> {
                 }
             }
         }
-        tcsetattr(opts.file.as_fd(), set_arg, &termios)
-            .expect("Could not write terminal attributes");
+        tcsetattr(opts.file.as_fd(), set_arg, &termios)?;
     } else {
         // TODO: Figure out the right error message for when tcgetattr fails
-        let termios = tcgetattr(opts.file.as_fd()).expect("Could not get terminal attributes");
-        print_settings(&termios, opts).expect("TODO: make proper error here from nix error");
+        let termios = tcgetattr(opts.file.as_fd())?;
+        print_settings(&termios, opts)?;
     }
     Ok(())
 }