diff --git a/openandroidinstaller/tooling.py b/openandroidinstaller/tooling.py
index d79cbe2f..1c268b00 100644
--- a/openandroidinstaller/tooling.py
+++ b/openandroidinstaller/tooling.py
@@ -218,7 +218,6 @@ def adb_twrp_wipe_and_install(
             sleep(1)
             if (type(line) == bool) and not line:
                 yield False
-                return
             break
     # finally reboot into os or to fastboot for flashing addons
     sleep(7)
diff --git a/openandroidinstaller/views/step_view.py b/openandroidinstaller/views/step_view.py
index 53e08672..2ce03cda 100644
--- a/openandroidinstaller/views/step_view.py
+++ b/openandroidinstaller/views/step_view.py
@@ -335,7 +335,7 @@ def display_progress_bar(self, line: str):
         result = None
         # get the progress numbers from the output lines
         if (type(line) == str) and line.strip():
-            result = re.search(r"\(\~(\d{1,3})\%\)|(Total xfer:)", line.strip())
+            result = re.search(r"\(\~(\d{1,3})\%\)|(Total xfer:|adb: failed to read command: Success)", line.strip())
         if result:
             if result.group(1):
                 percentage_done = int(result.group(1))