Handle Servers Safely

Handle Servers Safely