Merge "Fix typo and add more descriptive error"