Remove unless try ... catch