Put CATCH block in the correct place