Check for empty ddpr the same way everywhere.