Move patch from try-catch