From d57e9f13d7b1c7a0639808baf7f5b47d16369df6 Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Thu, 20 Oct 2016 18:07:30 +0200
Subject: [PATCH] px_uploader.py: catch exception in except block

This could lead to an exception if serial is not available.
---
 Tools/px_uploader.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Tools/px_uploader.py b/Tools/px_uploader.py
index 92c56efd2a..fca9e81c27 100755
--- a/Tools/px_uploader.py
+++ b/Tools/px_uploader.py
@@ -525,9 +525,11 @@ class uploader(object):
                     self.port.flush()
                     self.port.baudrate = self.baudrate_bootloader
                 except:
-                    self.port.flush()
-                    self.port.baudrate = self.baudrate_bootloader
-                    return
+                    try:
+                        self.port.flush()
+                        self.port.baudrate = self.baudrate_bootloader
+                    except Exception:
+                        pass
 
 
 # Detect python version