diff --git a/SignalIntegrity/App/DeviceNetListLine.py b/SignalIntegrity/App/DeviceNetListLine.py
index a1f5d8b9e..af840c34d 100644
--- a/SignalIntegrity/App/DeviceNetListLine.py
+++ b/SignalIntegrity/App/DeviceNetListLine.py
@@ -56,7 +56,7 @@ def NetListLine(self,device):
                 if kwc['ShowKeyword']:
                     returnstring=returnstring+kwc['Keyword']+' '
                 valueString=device[kwc['Keyword']].PropertyString(stype='netlist')
-                if valueString is None:
+                if valueString == None or valueString == '':
                     valueString='None'
                 returnstring=returnstring+valueString
         return returnstring
diff --git a/SignalIntegrity/Lib/Measurement/Calibration/Calibration.py b/SignalIntegrity/Lib/Measurement/Calibration/Calibration.py
index 21f06c2c2..43acc34e1 100644
--- a/SignalIntegrity/Lib/Measurement/Calibration/Calibration.py
+++ b/SignalIntegrity/Lib/Measurement/Calibration/Calibration.py
@@ -254,6 +254,7 @@ def _CalculateUnknownThruErrorTerms(self,measurements):
                                     else Sestsp[max(n-1,0)],driven,other)
                             Sest=SParameters(self.f,Sestsp)
                             Sest=Sest.LimitImpulseResponseLength(meas.limit)
+                            Sest.WriteToFile('RecoveredThru')
                             measurements[other][driven].append(
                                 ThruCalibrationMeasurement(
                                 meas.Smeasured.FrequencyResponse(1,1),
diff --git a/SignalIntegrity/Lib/Parsers/CalibrationParser.py b/SignalIntegrity/Lib/Parsers/CalibrationParser.py
index d32462d29..57187cd33 100644
--- a/SignalIntegrity/Lib/Parsers/CalibrationParser.py
+++ b/SignalIntegrity/Lib/Parsers/CalibrationParser.py
@@ -62,7 +62,9 @@ def _ProcessCalibrationLine(self,line):
                     if tokenName == 'file':
                         measDict['raw']=SParameterFile(tokenValue).Resample(self.m_f)
                     elif tokenName == 'std':
-                        if not tokenValue in self.m_spc:
+                        if tokenValue == 'None':
+                            self.m_spc[tokenValue] = None
+                        elif not tokenValue in self.m_spc:
                             self.m_spc[tokenValue] = SParameterFile(tokenValue)
                         measDict['std']=self.m_spc[tokenValue]
                     elif tokenName == 'pn':