Updated error message to reflect the API changes, better item auto-detect