Still alive errorcatch
Merge branch 'master' of github.com:soykyke/P2PNetworking