Match creation validation and error handling
Changed variable names to camelCase for consistency