Added runtime checks for server and client