ANA-585: do not raise no CP error if where_clause is set