fixes 2109 - removed all returns inside of finally blocks.  All behavior...

... should be as before except some additional logging will happen in cases where exceptions were being ignored.

Per JT this needs to only be in master - NOT 2.2.1