diff --git a/heat/db/sqlalchemy/migrate_repo/versions/043_migrate_template_versions.py b/heat/db/sqlalchemy/migrate_repo/versions/043_migrate_template_versions.py
index 82eef6a5b..eef71b3a3 100644
--- a/heat/db/sqlalchemy/migrate_repo/versions/043_migrate_template_versions.py
+++ b/heat/db/sqlalchemy/migrate_repo/versions/043_migrate_template_versions.py
@@ -44,7 +44,7 @@ def upgrade(migrate_engine):
 
                 try:
                     dt = time.strptime(version, '%Y-%m-%d')
-                except ValueError:
+                except (TypeError, ValueError):
                     dt = None
 
                 if dt is None or dt < patch_date: