     wifiState = wifiEnabled ? .on : .off
 
     let bssid = ((wifiState == .on) && wifiConnected)
-                ? networkReachability.BSSID()
-                : NSNull()
+                ? networkReachability.bssid()
+                : nil
     let ssid = ((wifiState == .on) && wifiConnected)
-                ? networkReachability.SSID()
-                : NSNull()
+                ? networkReachability.ssid()
+                : nil
 
     let networkStatus = [
       NetworkStatusParameters.wifi.rawValue                : wifiState.rawValue,

      bluetoothState = .on
      bluetoothLowEnergyState = .on
      #if TEST
        NSNotificationCenter.defaultCenter().postNotificationName(
          Constants.NSNotificationName.centralBluetoothManagerDidChangeState,
          object: self
        )
      #endif

      NetworkStatusParameters.ssid.rawValue                : ssid
    ]

    delegate?.context(self, didChangeNetworkStatus: jsonValue(networkStatus as AnyObject))
  }

  fileprivate func handleWillEnterBackground() {
