Adjusted server to handle less errors; More core-side.