Merge "Add null check for Wi-Fi command"