Fix issue where subscribing to a suggestion can get into a bad state if there is an error