diff --git a/matlab/TCV/gdat_tcv.m b/matlab/TCV/gdat_tcv.m
index bdd35efc43ab68fc8c6e4e7d82c85dd50a985409..fd423874aa907ffcf1db14aaf12690183d693031 100644
--- a/matlab/TCV/gdat_tcv.m
+++ b/matlab/TCV/gdat_tcv.m
@@ -1748,11 +1748,26 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
           gdat_data.ec.ec_data = ec_data;
           filled_successfully = true; %set flag to true
         catch ME
-          warning(ME.identifier,'Problem loding TORAY data. \nError message: %s',ME.message);
-        end
-        
+          warning(ME.identifier,'Problem retrieving TORAY data. \nError message: %s',ME.message);
+          % try to identify cause of the error
+          if ~check_nodes_filled(shot,'toray')  
+            if ~any(ec_inputs.launchers_active.data,1)
+              msg = 'write_pyro(shot) found NO active launchers, maybe there was no EC in this shot?';
+            else
+              msg = 'write_pyro(shot) found active launchers, but TORAY nodes are no filled, check hldsi(shot), and (ask to) relaunch TORAY.';
+            end
+          elseif ~isempty(gdat_data.gdat_params.trialindx)
+            msg = 'Is the trial index filled? Check TORAY nodes with hdlsi(shot).';
+          else
+            msg = 'Unknown problem retrieving ec_data.';
+          end
+          warning(msg);
+          gdat_data.ec.help = msg;
+        end        
       else
-        disp(['source_icd.ec = ' source_icd.ec ' not yet implemented, ask O. Sauter'])
+        msg  = ['source_icd.ec = ' source_icd.ec ' not yet implemented, ask O. Sauter'];
+        disp(msg);
+        gdat_data.ec.help = msg;
       end
       
       % depending if ec_data could be completely retrieved, setup the final gdat output
@@ -1780,12 +1795,7 @@ elseif strcmp(mapping_for_tcv.method,'switchcase')
         end
         
       else %~filled_successfully
-        % if reading toray data, check if there is data in the nodes - might be only one trial though  
-        if strcmp(lower(source_icd.ec),'toray') && ~check_nodes_filled(shot,'toray')  
-          msg = 'Toray nodes were no filled, check hldsi(shot).'; warning(msg);
-          gdat_data.ec.help = msg;
-        end
-        
+                
         % fill ec_data empty
         ec_data.p_abs_plasma = [];
         ec_data.p_abs_plasma_label = [];