--- a/maxious-canberra-transit-feed/createfeed.py
+++ b/maxious-canberra-transit-feed/createfeed.py
@@ -69,8 +69,10 @@
   stopset = set()
   for route in routedata:
     stopset.update(route['time_points'])
-    for between_list in route['between_stops']:
-      stopset.update(route['between_stops'][between_list])
+    if len(route['between_stops']) > 0:
+	for between_list in route['between_stops']:
+		if route['between_stops'][between_list] != None:
+		      stopset.update(route['between_stops'][between_list])
 
   toprune = list()
   for i, stop in enumerate(stopsdata):
@@ -93,6 +95,8 @@
     stop = transitfeed.Stop(stop_id=stop_id, lat=stopdata['lat'], 
                             lng=stopdata['lng'], name=stopdata['name'], 
                             stop_code=stop_code)
+    if 'zone_id' in stopdata:
+	stop.zone_id = stopdata['zone_id']
     schedule.AddStopObject(stop)
     stops[stop_code] = stop
 
@@ -150,7 +154,7 @@
         if between_stop_list:
           for between_stop_code in between_stop_list:          
             t.AddStopTime(stop=stops[between_stop_code]) 
-
+      #print stop_code + routedata['short_name']
       t.AddStopTime(stop=stops[stop_code], arrival_secs=time,
                     departure_secs=time)
       prev_stop_code = stop_code