diff --git a/hub/imports/energy_systems/montreal_custom_energy_system_parameters.py b/hub/imports/energy_systems/montreal_custom_energy_system_parameters.py
index 5e4eda61..f80f66e9 100644
--- a/hub/imports/energy_systems/montreal_custom_energy_system_parameters.py
+++ b/hub/imports/energy_systems/montreal_custom_energy_system_parameters.py
@@ -123,9 +123,12 @@ class MontrealCustomEnergySystemParameters:
     energy_systems_connection = city.energy_systems_connection_table
     for building in city.buildings:
       _building_energy_systems = []
-      energy_systems = energy_systems_connection['Energy System Type'] \
-        .where(energy_systems_connection['Building'] == building.name)
+      energy_systems = energy_systems_connection['Energy System Type'].where(
+        energy_systems_connection['Building'] == building.name
+      )
       for energy_system in energy_systems:
+        if str(energy_system) == 'nan':
+          break
         _generic_building_energy_systems = city.generic_energy_systems[energy_system]
         for _generic_building_energy_system in _generic_building_energy_systems:
           _building_energy_equipment = EnergySystem()
diff --git a/hub/version.py b/hub/version.py
index 60d736b5..1f40d881 100644
--- a/hub/version.py
+++ b/hub/version.py
@@ -1,4 +1,4 @@
 """
 Hub version number
 """
-__version__ = '0.1.7.16'
+__version__ = '0.1.7.17'