Added try-catch to secure db integrity during operations
Merge remote-tracking branch 'origin/master'