diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
index c4be82c9..ba3dabe5 100644
--- a/gui/qt/installwizard.py
+++ b/gui/qt/installwizard.py
@@ -166,6 +166,9 @@ class InstallWizard(QDialog, MessageBoxMixin, WizardBase):
         except UserCancelled:
             self.print_error("wallet creation cancelled by user")
             self.accept()  # For when called from menu
+        except BaseException as e:
+            self.show_error(str(e))
+            raise
         return wallet
 
     def remove_from_recently_open(self, filename):
diff --git a/plugins/trezor/plugin.py b/plugins/trezor/plugin.py
index f7bd3a47..db15772a 100644
--- a/plugins/trezor/plugin.py
+++ b/plugins/trezor/plugin.py
@@ -221,8 +221,7 @@ class TrezorCompatiblePlugin(HW_PluginBase):
         devmgr = self.device_manager()
         device_info = devmgr.select_device(wallet, self)
         if not device_info:
-            wallet.handler.show_error(_("No devices found"))
-            raise RuntimeError("No devices found")
+            raise RuntimeError(_("No devices found"))
         devmgr.pair_wallet(wallet, device_info.device.id_)
         if device_info.initialized:
             task = partial(wallet.create_hd_account, None)