Add more checks for server init