Done.

Seeing this here, I'm a little concerned that try { } finally without catch reporting is going to make modifying the code harder as exceptions are silently swallowed. Do you think we could add some catches?