added error handling for new retail format