Fixing blocker violation: Return statements should not occur in finally blocks.
Fixed a blocker violation: Throwable and Error classes should not be caught. Removed unused private function.