Add None check for bssid