This isn't an issue with this patch, but shouldn't this be in a finally block?