Merge "fix return from finally"