Removed catch and throw exceptions from private methods.
SQL query test and fix.
More SQL testing and fixes.