Add some server validation