diff --git a/fHDHR/device/channels/__init__.py b/fHDHR/device/channels/__init__.py
index 113ef43..718a56b 100644
--- a/fHDHR/device/channels/__init__.py
+++ b/fHDHR/device/channels/__init__.py
@@ -49,10 +49,10 @@ class Channels():
         channel_ids = self.fhdhr.db.get_fhdhr_value("channels", "list") or []
         if len(channel_ids):
             self.fhdhr.logger.info("Found %s existing channels in the database." % str(len(channel_ids)))
-        for channel_id in channel_ids:
-            channel_obj = Channel(self.fhdhr, self.id_system, channel_id=channel_id)
-            channel_id = channel_obj.dict["id"]
-            self.list[channel_id] = channel_obj
+            for channel_id in channel_ids:
+                channel_obj = Channel(self.fhdhr, self.id_system, channel_id=channel_id)
+                channel_id = channel_obj.dict["id"]
+                self.list[channel_id] = channel_obj
 
     def save_db_channels(self):
         channel_ids = [x["id"] for x in self.get_channels()]
diff --git a/fHDHR/tools/__init__.py b/fHDHR/tools/__init__.py
index 3024768..2053c28 100644
--- a/fHDHR/tools/__init__.py
+++ b/fHDHR/tools/__init__.py
@@ -12,12 +12,13 @@ def channel_sort(channel_list):
     """Take a list of channel number strings and sort the Numbers and SubNumbers"""
     chan_dict_list_split = {}
     for number in channel_list:
-        try:
-            subnumber = number.split(".")[1]
-        except IndexError:
-            subnumber = None
-        prinumber = number.split(".")[0]
-        chan_dict_list_split[number] = {"number": prinumber, "subnumber": subnumber}
+        if number and number not in ["None"]:
+            try:
+                subnumber = number.split(".")[1]
+            except IndexError:
+                subnumber = None
+            prinumber = number.split(".")[0]
+            chan_dict_list_split[number] = {"number": prinumber, "subnumber": subnumber}
     return sorted(chan_dict_list_split, key=lambda i: (int(chan_dict_list_split[i]['number']), int(chan_dict_list_split[i]['subnumber'] or 0)))