Adding handling of invalid org id sites