WIPpython

lisa/trace.py

@@ -4254,15 +4254,13 @@ def _df_event(self, event, raw, window, signals, signals_init, compress_signals_
         cache_desc = _CacheDataDesc(spec=spec, fmt=TraceCache.DATAFRAME_SWAP_FORMAT)
 
         try:
-            df = self._cache.fetch(cache_desc, insert=True)
-        except KeyError:
-            df = self._load_df(cache_desc, sanitization_f=sanitization_f, write_swap=write_swap)
-
-        if df.empty:
-            raise MissingTraceEventError(
-                [event],
-                available_events=self.available_events,
-            )
+            try:
+                df = self._cache.fetch(cache_desc, insert=True)
+            except KeyError:
+                df = self._load_df(cache_desc, sanitization_f=sanitization_f, write_swap=write_swap)
+        except MissingTraceEventError as e:
+            e.available_events = self.available_events
+            raise e
 
         # We used to set a ".name" attribute, but:
         # 1. There is no central way of saving these metadata when serializing