More SQLException handling cleanup/code deletion.
Merge remote-tracking branch 'origin/develop' into develop