Database data-driven fixed exception issues