Added check on url