diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
index 78cffbffb..2a638478b 100644
--- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
+++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
@@ -864,7 +864,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
                                 else if (currentActivity.ToLower().Contains(ConditnlUpdateQ2CorrectionsStr.ToLower()))  error = WriteQ2Correction(threadID, ihead, wm, currentTest, ref resultStr, Q2CorrType.ConditionalUpdate, currentActivity.Substring(ConditnlUpdateQ2CorrectionsStr.Length).Trim());
                                 else if (currentActivity.ToLower() == Reset2HzCorrectionStr.ToLower())                  error = Reset2HzCorrection(threadID, ihead, wm, ref resultStr);
                                 else if (currentActivity.ToLower() == Write2HzCorrectionStr.ToLower())                  error = Write2HzCorrection(threadID, ihead, wm, ref resultStr);
-                                else if (currentActivity.ToLower() == GetDefaultQ2CorrectionsStr.ToLower())      error = GetQ2PreCorrectionsFormRest(threadID, ihead, wm, ref resultStr);
+                                else if (currentActivity.ToLower() == GetDefaultQ2CorrectionsStr.ToLower())             error = GetQ2PreCorrectionsFormRest(threadID, ihead, wm, ref resultStr);
 
 #endif
                                 else
@@ -892,7 +892,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
                                 {
                                     ihead.CommFailed = true;
 
-                                    if ((wm.ResultCode & (int)Results.Entities.ResultCode.RfidErrorCodeMask) == 0)
+                                    if (wm != null && (wm.ResultCode & (int)Results.Entities.ResultCode.RfidErrorCodeMask) == 0)
                                     {
                                         wm.ResultCode |= (((int)error << 16) | ((int)tests[i].ItemNr << 20));
                                     }
@@ -903,7 +903,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
                                 {
                                     ihead.CommFailed = true;
 
-                                    if ((wm.ResultCode & (int)Results.Entities.ResultCode.RfidErrorCodeMask) == 0)
+                                    if (wm != null && (wm.ResultCode & (int)Results.Entities.ResultCode.RfidErrorCodeMask) == 0)
                                     {
                                         wm.ResultCode |= (((int)error << 16) | ((int)tests[i].ItemNr << 20));
                                     }
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 128a9aa39..9e3071476 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.26.1528.0")]
-[assembly: AssemblyFileVersion("2.26.1528.0")]
+[assembly: AssemblyVersion("2.26.1542.0")]
+[assembly: AssemblyFileVersion("2.26.1542.0")]