Added Data Exception catch.
Merge branch 'convertToRealDB'