Fixed platform dependent unit test and added Exception handling to NetWatcher