Added NetworkException and Server Poller

Various other small changes