Simplified error handling