diff --git a/origin/origin_channels.py b/origin/origin_channels.py
index 48b9dab..b9cdbf1 100644
--- a/origin/origin_channels.py
+++ b/origin/origin_channels.py
@@ -29,15 +29,20 @@ class OriginChannels():
             filters_passed = True
             for filter_key in list(self.origin.filter_dict.keys()):
 
-                if filters_passed:
-
-                    filter_values = self.origin.filter_dict[filter_key]
+                if len(self.origin.filter_dict[filter_key]) and filters_passed:
 
                     if filter_key in ["country", "language"]:
-                        chan_value = channels_item[filter_key]["name"]
+                        try:
+                            chan_value = channels_item[filter_key]["name"]
+                        except TypeError:
+                            chan_value = None
+                    elif filter_key in ["category"]:
+                        chan_value = channels_item[filter_key]
 
-                    if chan_value.lower() not in [x.lower() for x in filter_values]:
+                    if (not chan_value or
+                       str(chan_value).lower() not in [x.lower() for x in self.origin.filter_dict[filter_key]]):
                         filters_passed = False
+
             if filters_passed:
                 filtered_chan_list.append(channels_item)