Enhance: Add try catch