Added some error handling and deleting of servers