Issue #202 - Handle no such offer case