Updated server and exception handling