diff --git a/lib/tvrage_api/tvrage_api.py b/lib/tvrage_api/tvrage_api.py
index 734b5ab3..24bc2f9f 100644
--- a/lib/tvrage_api/tvrage_api.py
+++ b/lib/tvrage_api/tvrage_api.py
@@ -454,8 +454,11 @@ class TVRage:
                         value = value['#text']
                     if key == 'genre':
                         value = value['genre']
+                        if not value:
+                            value=[]
                         if not isinstance(value, list):
                             value = [value]
+                        value = filter(None, value)
                         value = '|' + '|'.join(value) + '|'
                 try:
                     if key == 'firstaired' and value in "0000-00-00":