Empty custom error handlers inside branch bodies can round-trip as return

Empty custom error handlers inside branch bodies can round-trip as return #224