diff --git a/pyflichub/flichub.py b/pyflichub/flichub.py
index 072ab6f..efda77c 100644
--- a/pyflichub/flichub.py
+++ b/pyflichub/flichub.py
@@ -30,8 +30,10 @@ def __init__(self, state, ssid):
         self.ssid = ssid
 
 
-def _decode_ssid(ssid_list):
-    return ''.join(chr(byte) for byte in ssid_list)
+def _decode_ssid(ssid):
+    if ssid is None:
+        return None
+    return ''.join(chr(byte) for byte in ssid)
 
 
 class FlicHubInfo: