diff --git a/crpptbx/TCV/gdat_tcv.m b/crpptbx/TCV/gdat_tcv.m
index c0381d59fb95a03fda206919eb3ca642a6daacbe..d8df155b21435ea028559e722d2cdd95018ea521 100644
--- a/crpptbx/TCV/gdat_tcv.m
+++ b/crpptbx/TCV/gdat_tcv.m
@@ -792,8 +792,10 @@ max(zeffshift)
     gdat_data.x=rho;
     %%%%%%%%%%% add fitted profiles if 'fit'>=1
     default_fit_type = 'conf';
-    if isfield(gdat_data.gdat_params,'fit') && ~isempty(gdat_data.gdat_params.fit) && ...
-          gdat_data.gdat_params.fit>0
+    if ~isfield(gdat_data.gdat_params,'fit') || ~isempty(gdat_data.gdat_params.fit)
+      gdat_data.gdat_params.fit = 1;
+    end
+    if gdat_data.gdat_params.fit>0
       % default is from proffit:avg_time
       if ~(isfield(gdat_data.gdat_params,'fit_type') && ~isempty(gdat_data.gdat_params.fit_type)) || ~any(strcmp(gdat_data.gdat_params.fit_type,{'local', 'avg', 'conf'}))
         gdat_data.gdat_params.fit_type = default_fit_type;
@@ -831,11 +833,23 @@ max(zeffshift)
       end
       tracetdi=tdi(nodenameeff);
       if isempty(trialindx)
-        gdat_data.fit.data = tracetdi.data;
+        if ~isempty(tracetdi.data) && ~isempty(tracetdi.dim) && ~ischar(tracetdi.data)
+          gdat_data.fit.data = tracetdi.data;
+        else
+          if nverbose>=1
+            disp([nodenameeff ' is empty, thus no fits, check hldsi(shot) and may need to run anaprofs?'])
+          end
+          gdat_data.fit.data = [];
+          gdat_data.fit.data_fullpath = [nodenameeff ' is empty'];
+          return
+        end
       else
         if ~isempty(tracetdi.data) && size(tracetdi.data,3)>=trialindx+1
           gdat_data.fit.data = tracetdi.data(:,:,trialindx+1);
         else
+          if nverbose>=1
+            disp([nodenameeff ' with trialindx=' num2str(trialindx) ' is empty, thus no fits, check hldsi(shot) and may need to run anaprofs?'])
+          end
           gdat_data.fit.data = [];
           gdat_data.fit.data_fullpath = [nodenameeff ' with trialindx=' num2str(trialindx) ' is empty'];
           return
@@ -883,7 +897,6 @@ max(zeffshift)
         gdat_data.fit.data_fullpath = [gdat_data.fit.data_fullpath ' ; ' nodenameeff ' and pe in data'];
       end
     else
-      gdat_data.gdat_params.fit = 0;
       gdat_data.gdat_params.fit_type = default_fit_type;
     end
     %%%%%%%%%%%