Add additional state checks to server