diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m
index 62e6fc666053da27a329d0b57088ce1602b598e4..172759d266545ec55b6c109d71e1557fba0ee1a6 100644
--- a/crpptbx/TCV/gdat_tcv.m
+++ b/crpptbx/TCV/gdat_tcv.m
@@ -1604,6 +1604,14 @@ end
 
 nodenameeff = ['\results::thomson' edge_str_dot ':' data_request_eff(1:2)];
 tracetdi=tdi(nodenameeff);
+if isempty(tracetdi.data) || ischar(tracetdi.data) || isempty(tracetdi.dim)
+  gdat_data.error_bar = [];
+  gdat_data.firrat = [];
+  gdat_data.data_raw = [];
+  gdat_data.error_bar_raw = [];
+  return
+end
+
 gdat_data.data=tracetdi.data'; % Thomson data as (t,z)
 tracestd=tdi(['\results::thomson'  edge_str_dot ':' data_request_eff(1:2) ':error_bar']);
 gdat_data.error_bar=tracestd.data';