Server more robust...ish