Shutting done on "Add Wifi"

This is an answer, not a question. Lots of people are reporting the watch shutting down when trying to scan for WiFi networks. Well it turns out for me that if you have the watch connected to the charger when you get it to scan then it works just fine. Similarly if you want to download music - if on charge it is fine, if not it shuts down.
Hope that helps people.