Enhance: Add try-catch