-Started on work to get server restart working

-Added error handling around entity refresh methods in tree view