Replacing .unwrap() calls with error handling