Added check for *org* parameter.