diff --git a/tripleo_common/image/image_uploader.py b/tripleo_common/image/image_uploader.py
index 27b5530dc..7a75972af 100644
--- a/tripleo_common/image/image_uploader.py
+++ b/tripleo_common/image/image_uploader.py
@@ -772,7 +772,7 @@ class BaseImageUploader(object):
                 tag_label = tag_from_label.format(**labels)
             except ValueError as e:
                 raise ImageUploaderException(e)
-            except KeyError as e:
+            except (KeyError, TypeError) as e:
                 if fallback_tag:
                     tag_label = fallback_tag
                 else: