diff --git a/crpptbx/AUG/CEZ_CMZ_fit.m b/crpptbx/AUG/CEZ_CMZ_fit.m
index ace671e8304a315ea9efa1c685d65c3e4dc7dba0..69e4ec5c552df7110a4705def2b18399a21259bb 100644
--- a/crpptbx/AUG/CEZ_CMZ_fit.m
+++ b/crpptbx/AUG/CEZ_CMZ_fit.m
@@ -73,6 +73,9 @@ else
   tension_vrot_eff=-3;
 end
 
+tifit = [];
+dtifitdrn = [];
+
 doplot=0;
 for i=1:length(ij)
   it_cxrs = find(cxrs.t>=t1(i) & cxrs.t<t2(i));
@@ -115,7 +118,8 @@ for i=1:length(ij)
   [rhoeff,irhoeff] = sort(rhotor_data_tofit);
   tidata_tofit_eff = tidata_tofit(irhoeff);
   if isempty(tidata_tofit_eff)
-    keyboard
+    disp('tidata_tofit_eff empty')
+    return
   else
     vrotdata_tofit_eff = vrotdata_tofit(irhoeff);
     tierr_tofit_eff = tierr_tofit(irhoeff);
diff --git a/crpptbx/AUG/gdat_aug.m b/crpptbx/AUG/gdat_aug.m
index 708413db8e5dde115970db8dca32d7b5fc40476e..891ab6f4942d9239ead5664e384ddb8537ed5bad 100644
--- a/crpptbx/AUG/gdat_aug.m
+++ b/crpptbx/AUG/gdat_aug.m
@@ -1839,7 +1839,7 @@ elseif strcmp(mapping_for_aug.method,'switchcase')
     if ~isfield(gdat_data.gdat_params,'time_interval')
       gdat_data.gdat_params.time_interval = [];
     end
-    [aa,bb]=unix(['ssh ' 'sxaug20.aug.ipp.mpg.de WhichSX ' num2str(shot) ' ' ...
+    [aa,bb]=unix(['ssh ' '-o "StrictHostKeyChecking no" sxaug20.aug.ipp.mpg.de WhichSX ' num2str(shot) ' ' ...
 		  upper(gdat_data.gdat_params.source)]);
     chords_ok_diags=regexpi(bb,'(?<chord>[A-Z]_[0-9]+)\saddress:\s[0-9]+\sDiag:\s(?<diag>[A-Z]+)','names');
     if isempty(chords_ok_diags)