Fixed fix to returning value from finally block. ;-) Committed too early.