diff --git a/lang/python/examples/howto/import-keys-hkp.py b/lang/python/examples/howto/import-keys-hkp.py
index 1abd0fd3..f5d97876 100755
--- a/lang/python/examples/howto/import-keys-hkp.py
+++ b/lang/python/examples/howto/import-keys-hkp.py
@@ -1,126 +1,131 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 from __future__ import absolute_import, division, unicode_literals
 
 import gpg
 import hkp4py
 import sys
 
 # Copyright (C) 2018 Ben McGinnes <ben@gnupg.org>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Lesser General Public License as published by the Free
 # Software Foundation; either version 2.1 of the License, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 # FOR A PARTICULAR PURPOSE.  See the GNU General Public License and the GNU
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License and the GNU
 # Lesser General Public along with this program; if not, see
 # <https://www.gnu.org/licenses/>.
 
 print("""
 This script imports one or more public keys from the SKS keyservers.
 """)
 
 c = gpg.Context()
 server = hkp4py.KeyServer("hkps://hkps.pool.sks-keyservers.net")
 results = []
 keys = []
 
 if len(sys.argv) > 2:
     pattern = " ".join(sys.argv[1:])
 elif len(sys.argv) == 2:
     pattern = sys.argv[1]
 else:
     pattern = input("Enter the pattern to search for keys or user IDs: ")
 
 
 if pattern is not None:
     try:
         key = server.search(hex(int(pattern, 16)))
         keyed = True
     except ValueError as ve:
         key = server.search(pattern)
         keyed = False
 
     if key is not None:
         keys.append(key[0])
         if keyed is True:
             try:
                 fob = server.search(pattern)
-            except:
+            except Exception as e:
                 fob = None
             if fob is not None:
                 keys.append(fob[0])
+            else:
+                pass
         else:
             pass
-    else:
-        pass
 
     for logrus in pattern.split():
-        try:
-            key = server.search(hex(int(logrus, 16)))
-            hexed = True
-        except ValueError as ve:
-            key = server.search(logrus)
-            hexed = False
-
-        if key is not None:
-            keys.append(key[0])
-            if hexed is True:
-                try:
-                    fob = server.search(logrus)
-                except:
-                    fob = None
-                if fob is not None:
-                    keys.append(fob[0])
+        if logrus != pattern:
+            try:
+                key = server.search(hex(int(logrus, 16)))
+                hexed = True
+            except ValueError as ve:
+                key = server.search(logrus)
+                hexed = False
+
+            if key is not None:
+                keys.append(key[0])
+                if hexed is True:
+                    try:
+                        fob = server.search(logrus)
+                    except Exception as e:
+                        fob = None
+                    if fob is not None:
+                        keys.append(fob[0])
+                    else:
+                        pass
+                else:
+                    pass
             else:
                 pass
         else:
             pass
 
 
 if len(keys) > 0:
     for key in keys:
         import_result = c.key_import(key.key_blob)
         results.append(import_result)
 
 for result in results:
     if result is not None and hasattr(result, "considered") is False:
         print(result)
     elif result is not None and hasattr(result, "considered") is True:
         num_keys = len(result.imports)
         new_revs = result.new_revocations
         new_sigs = result.new_signatures
         new_subs = result.new_sub_keys
         new_uids = result.new_user_ids
         new_scrt = result.secret_imported
         nochange = result.unchanged
         print("""
 The total number of keys considered for import was:  {0}
 
    Number of keys revoked:  {1}
  Number of new signatures:  {2}
     Number of new subkeys:  {3}
    Number of new user IDs:  {4}
 Number of new secret keys:  {5}
  Number of unchanged keys:  {6}
 
 The key IDs for all considered keys were:
 """.format(num_keys, new_revs, new_sigs, new_subs, new_uids, new_scrt,
            nochange))
         for i in range(num_keys):
             print(result.imports[i].fpr)
         print("")
     else:
         print("No keys were imported or found.")