Merge "Improving error message in case invalid interests are returned"