fix: Replace the try catch to a better handler.