diff --git a/mikrotikbackup.yml b/mikrotikbackup.yml
index da324d8..a3623c2 100644
--- a/mikrotikbackup.yml
+++ b/mikrotikbackup.yml
@@ -13,16 +13,15 @@
       delegate_to: localhost
 
     - name: Get router identity
-      ansible.builtin.shell: >
-        ssh -o ConnectTimeout=10 -o StrictHostKeyChecking=no
-        {{ ansible_user }}@{{ ansible_host }} -p {{ ansible_port }}
-        "/system identity print"
+      shell: timeout 15 ssh -o StrictHostKeyChecking=no {{ ansible_user }}@{{ ansible_host }} -p {{ ansible_port }} "/system identity print"
       register: system_identity
       delegate_to: localhost
+      failed_when: system_identity.rc != 0 and system_identity.rc != 124  # 124 = timeout
 
     - name: Set router name
       set_fact:
         router_name: "{{ system_identity.stdout.split(': ')[1] | trim }}"
+      when: system_identity.rc == 0
 
     - name: Generate current date
       ansible.builtin.shell: date +%Y-%m-%d
@@ -34,37 +33,30 @@
         current_date: "{{ date_output.stdout }}"
 
     - name: Export router config
-      ansible.builtin.shell: >
-        ssh -o ConnectTimeout=10 -o StrictHostKeyChecking=no
-        {{ ansible_user }}@{{ ansible_host }} -p {{ ansible_port }}
-        "/export"
+      shell: timeout 15 ssh -o StrictHostKeyChecking=no {{ ansible_user }}@{{ ansible_host }} -p {{ ansible_port }} "/export"
       register: export_output
       delegate_to: localhost
+      when: system_identity.rc == 0
+      failed_when: export_output.rc != 0 and export_output.rc != 124
 
     - name: Save export to local file
       ansible.builtin.copy:
         content: "{{ export_output.stdout }}"
         dest: "output/{{ router_name }}-{{ current_date }}.config"
       delegate_to: localhost
+      when: export_output.rc == 0
 
     - name: Create binary backup on router
-      ansible.builtin.shell: >
-        ssh -o ConnectTimeout=10 -o StrictHostKeyChecking=no
-        {{ ansible_user }}@{{ ansible_host }} -p {{ ansible_port }}
-        "/system backup save name={{ router_name }}-{{ current_date }}-backup"
+      shell: timeout 15 ssh -o StrictHostKeyChecking=no {{ ansible_user }}@{{ ansible_host }} -p {{ ansible_port }} "/system backup save name={{ router_name }}-{{ current_date }}-backup"
       delegate_to: localhost
+      when: system_identity.rc == 0
 
     - name: Download binary backup
-      ansible.builtin.shell: >
-        scp -o ConnectTimeout=10 -o StrictHostKeyChecking=no
-        -P {{ ansible_port }}
-        {{ ansible_user }}@{{ ansible_host }}:{{ router_name }}-{{ current_date }}-backup.backup
-        output/
+      shell: timeout 15 scp -o StrictHostKeyChecking=no -P {{ ansible_port }} {{ ansible_user }}@{{ ansible_host }}:{{ router_name }}-{{ current_date }}-backup.backup output/
       delegate_to: localhost
+      when: system_identity.rc == 0
 
     - name: Remove backup file from router
-      ansible.builtin.shell: >
-        ssh -o ConnectTimeout=10 -o StrictHostKeyChecking=no
-        {{ ansible_user }}@{{ ansible_host }} -p {{ ansible_port }}
-        "/file remove {{ router_name }}-{{ current_date }}-backup.backup"
+      shell: timeout 15 ssh -o StrictHostKeyChecking=no {{ ansible_user }}@{{ ansible_host }} -p {{ ansible_port }} "/file remove {{ router_name }}-{{ current_date }}-backup.backup"
       delegate_to: localhost
+      when: system_identity.rc == 0