Revision 021863e...(Back to digest)
Bug Fixes in Networking Tools
Another hack to try to prevent dangling pointers. When I have more time
I will try to make things in the correct way, for now this will just
make the crashes much less likely to happen.
(cherry picked from commit 93322e13815a92cf3357f38eb152cf3f456629f7)