Make empty defaults more forgiving