diff --git a/python/src/trezorlib/cli/__init__.py b/python/src/trezorlib/cli/__init__.py
index 41b03c6fea..ab2b15d100 100644
--- a/python/src/trezorlib/cli/__init__.py
+++ b/python/src/trezorlib/cli/__init__.py
@@ -21,7 +21,7 @@ from typing import TYPE_CHECKING, Any, Callable, Dict, Optional
 
 import click
 
-from .. import exceptions, transport
+from .. import exceptions, messages, transport
 from ..client import TrezorClient
 from ..ui import ClickUI, ScriptUI
 
@@ -103,6 +103,12 @@ class TrezorConnection:
         except transport.DeviceIsBusy:
             click.echo("Device is in use by another process.")
             sys.exit(1)
+        except exceptions.TrezorFailure as e:
+            if e.code is messages.FailureType.DeviceIsBusy:
+                click.echo(str(e))
+                sys.exit(1)
+            else:
+                raise e
         except Exception:
             click.echo("Failed to find a Trezor device.")
             if self.path is not None: