diff --git a/gtfsdb.py b/gtfsdb.py
index 77c71aa..860e70e 100755
--- a/gtfsdb.py
+++ b/gtfsdb.py
@@ -522,8 +522,12 @@ def agency_timezones(self):
         return list(x[0] for x in self.get_cursor().execute( query,() ))
 
     def agency(self,agency_id):
-        query = "SELECT agency_id,agency_name,agency_url,agency_phone,agency_timezone FROM agency WHERE agency_id = ?"
-        res = list(self.get_cursor().execute( query,(agency_id,) ))
+        if agency_id == "__DEFAULT__": # Likely only one entry
+            query = "SELECT agency_id,agency_name,agency_url,agency_phone,agency_timezone FROM agency"
+            res = list(self.get_cursor().execute( query ))
+        else:
+            query = "SELECT agency_id,agency_name,agency_url,agency_phone,agency_timezone FROM agency WHERE agency_id = ?"
+            res = list(self.get_cursor().execute( query,(agency_id,) ))
         if len(res) == 0:
             raise Exception('feed error: agency_id not found')
         elif len(res) > 1:
diff --git a/timetable.py b/timetable.py
index 7da265d..bf4785b 100755
--- a/timetable.py
+++ b/timetable.py
@@ -631,7 +631,10 @@ def time_string_from_seconds(sec) :
     agencyUrls.append('')
 else:
     for agency_id,agency_name,agency_url,agency_phone,agency_timezone in [db.agency(agencyId) for agencyId,idx in sorted_agencyIds]:
-        agencyIds.append(agency_id)
+        if agency_id == None: # agency_id is an optional value in GTFS
+            agencyIds.append('')
+        else:
+            agencyIds.append(agency_id)
         agencyNames.append(agency_name)
         agencyUrls.append(agency_url)
 write_text_comment("AGENCY IDS")