From 8f17f38b02406ff4f90940ea66dda4b5f93bf227 Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Wed, 18 Jul 2018 20:17:03 +0200
Subject: [PATCH] trezor/kk: when using old fw, wizard did not display
 instructions properly

---
 electrum/plugins/keepkey/keepkey.py | 5 ++++-
 electrum/plugins/trezor/trezor.py   | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/electrum/plugins/keepkey/keepkey.py b/electrum/plugins/keepkey/keepkey.py
index e0f568b83..611fe8442 100644
--- a/electrum/plugins/keepkey/keepkey.py
+++ b/electrum/plugins/keepkey/keepkey.py
@@ -141,7 +141,10 @@ class KeepKeyPlugin(HW_PluginBase):
                      'download the updated firmware from {}')
                    .format(self.device, client.label(), self.firmware_URL))
             self.print_error(msg)
-            handler.show_error(msg)
+            if handler:
+                handler.show_error(msg)
+            else:
+                raise Exception(msg)
             return None
 
         return client
diff --git a/electrum/plugins/trezor/trezor.py b/electrum/plugins/trezor/trezor.py
index 77af68755..7fecd1e6f 100644
--- a/electrum/plugins/trezor/trezor.py
+++ b/electrum/plugins/trezor/trezor.py
@@ -157,7 +157,10 @@ class TrezorPlugin(HW_PluginBase):
                      'download the updated firmware from {}')
                    .format(self.device, client.label(), self.firmware_URL))
             self.print_error(msg)
-            handler.show_error(msg)
+            if handler:
+                handler.show_error(msg)
+            else:
+                raise Exception(msg)
             return None
 
         return client