Support Huge Problem when using WiFi connection

view story

http://androidforums.com – I am facing a starnge problem during WIFI connection after I have upgradede to 4.0.4. When I browse using wifi after some time, the samsung galaxy s2 phone switches off. If I try to restart then it shows battery status with 1% charge status. The strange thing is not that, if I connect the phone to the charger for more than 2 minutes and then try a restart(while the phone is charging), then after restart the phone battery status comes back to normal. Is anyone else facing this issue? Can anyone suggest some work around to this issue? (General)