XD-1938: Prevent shell crash in completion

maybe as an info/warn.  Hard to imagine the case where we would enter the catch block (maybe communication breakdown).