Fix for crash on network lost.
updated title
merge latest