Merge pull request #6223 from annando/ap-dba-error