Error handling simplification