diff --git a/matlab/TCV_IMAS/tcv_ids_circuit.m b/matlab/TCV_IMAS/tcv_ids_circuit.m
index 68239822305ed6ec36ff9b7c383b29b9fe310734..30aab99ebb0ed8523a29bce8ac7b6d6aef3c0f1d 100644
--- a/matlab/TCV_IMAS/tcv_ids_circuit.m
+++ b/matlab/TCV_IMAS/tcv_ids_circuit.m
@@ -21,10 +21,10 @@ end
 % Preallocate memory and get data
 ids_struct_out(1:tcv_circuit_info.ntotcircuits) = ids_structures;
 for ii=1:tcv_circuit_info.ntotcircuits
-  if shot == -1; % model shot
+  if shot == -1 % model shot
     % replace by dummy
     tmpdata.dim{1} = [];
-    tmpdata.data = []; 
+    tmpdata.data = [];
     warning('no time data loaded for shot %d',shot);
     ids_struct_out_description{ii}.current = 'not loaded';
   else
diff --git a/matlab/TCV_IMAS/tcv_ids_supply.m b/matlab/TCV_IMAS/tcv_ids_supply.m
index 3bdb1a4a196ee4b109f38b122d6e605b9e76ca1d..954dc16dbff9d06fc20e7d53a409169d5db89e0d 100644
--- a/matlab/TCV_IMAS/tcv_ids_supply.m
+++ b/matlab/TCV_IMAS/tcv_ids_supply.m
@@ -22,7 +22,7 @@ end
 ids_struct_out(1:tcv_circuit_info.ntotpowersupplies) = ids_structures;
 for ii=1:tcv_circuit_info.ntotpowersupplies
   if shot ==-1
-    warning('no time data loaded for shot %d',shot);
+    warning('TCV:IDS:NoTimeData','no time data loaded for shot %d',shot);
     tmpdata.dim{1} = [];
     tmpdata.data = [];
     % empty dummy