check for default_tax present as well.

Fixes #4645