Add checks to the server side