diff --git a/yazi.sh b/yazi.sh
index 6a85ce6..655151d 100644
--- a/yazi.sh
+++ b/yazi.sh
@@ -133,16 +133,20 @@
     run cargo install --locked yazi-fm yazi-cli
   }
 
+  yazi_setup() {
+    run ya pack -u || run ya pack -i
+  }
+
   c_yazi() {
     if [ -e "$HOME/.config/yazi/package.toml" ]; then
       if command_exists ya; then
-        run ya pack -u || run ya pack -i
+        yazi_setup || echo_error "Yazi was not setup properly.."
       else
         if [ -e "$HOME/.cargo/env" ]; then
           echo_info "Loadet $HOME/.cargo/env"
           . "$HOME/.cargo/env"
 
-          run ya pack -u || run ya pack -i
+          yazi_setup || echo_error "Yazi was not setup properly.."
         else
           echo_error "Something went wrong when installing yazi.. ya is not available.."
         fi