add data guard.
Merge branch 'master' into fix_error_handling