diff --git a/server/site_tests/network_WiFi_ChannelScanDwellTime/network_WiFi_ChannelScanDwellTime.py b/server/site_tests/network_WiFi_ChannelScanDwellTime/network_WiFi_ChannelScanDwellTime.py
index ec40e70..793364c 100644
--- a/server/site_tests/network_WiFi_ChannelScanDwellTime/network_WiFi_ChannelScanDwellTime.py
+++ b/server/site_tests/network_WiFi_ChannelScanDwellTime/network_WiFi_ChannelScanDwellTime.py
@@ -148,10 +148,9 @@
                         timeout=self.SCAN_RETRY_TIMEOUT_SECONDS,
                         sleep_interval=0.5)
             except utils.TimeoutError:
-                if self._bss_list is None:
-                    raise error.TestFail('Unable to trigger scan on client.')
-                else:
-                    raise error.TestFail('Failed to find any BSS')
+                raise error.TestFail('Unable to trigger scan on client.')
+            if not self._bss_list:
+                raise error.TestFail('Failed to find any BSS')
 
             # Remaining work is done outside the FrameSender
             # context. This is to ensure that no additional frames are