Fixed error handling for ambiguous requests