Fix handling of piggybacking errors not to break on success!