Revert "catch error in final"

This reverts commit 953a88f152e749a0f5eed787a8634ed6d1457f13.