reverted temporary try-catch