added some server validation