diff --git a/crpptbx/TCV/loadTCVdata.m b/crpptbx/TCV/loadTCVdata.m
index c519945f7ed35850dd17e97678b517c7ac6af74e..5856cd6345bdbc255f2a65225e8a49f98f77a2d0 100644
--- a/crpptbx/TCV/loadTCVdata.m
+++ b/crpptbx/TCV/loadTCVdata.m
@@ -527,7 +527,7 @@ switch TCVkeywrdcase{index}
     end
     tracetdi=tdi(nodenameeff);
     mdsclose;
-    if isempty(tracetdi.data) | isnan(tracetdi.data)
+    if isempty(tracetdi.data) || (~iscell(tracetdi.data) && isnan(tracetdi.data))
       disp(['node ' nodenameeff ' is empty for shot = ' num2str(shot)])
       return
     end