diff --git a/UpdateClientPage/UpdateClientPageVM.vb b/UpdateClientPage/UpdateClientPageVM.vb
index 3b7c8f5..c34537d 100644
--- a/UpdateClientPage/UpdateClientPageVM.vb
+++ b/UpdateClientPage/UpdateClientPageVM.vb
@@ -99,7 +99,8 @@ Public Class UpdateClientPageVM
       " WHERE " & DB_CLIENTID & " LIKE " & IdToUpdate
       'm_SelReseller = ManageDb.ExecuteResellerQuery(rQuery)(0)
       'm_SelReseller = m_ResellerList(2)
-      m_SelReseller = m_ResellerList.FirstOrDefault(Function(resel) resel.ResellerName.Equals(ManageDb.ExecuteResellerQuery(selQuery)(0).ResellerName))
+      Dim selRes As String = ManageDb.ExecuteResellerQuery(selQuery)(0).ResellerName
+      m_SelReseller = m_ResellerList.FirstOrDefault(Function(resel) resel.ResellerName.Equals(selRes))
       NotifyPropertyChanged("SelReseller")
    End Sub
 
diff --git a/UpdateKeyPage/UpdateKeyPageVM.vb b/UpdateKeyPage/UpdateKeyPageVM.vb
index 10f65be..5022506 100644
--- a/UpdateKeyPage/UpdateKeyPageVM.vb
+++ b/UpdateKeyPage/UpdateKeyPageVM.vb
@@ -235,7 +235,8 @@ Public Class UpdateKeyPageVM
 
       Dim nQuery As String = "SELECT * FROM " & DB_CLIENT & " WHERE " & DB_CLIENTID & " = '" & Key.ClientID & "'"
       If ManageDb.ExecuteClientQuery(nQuery).Count <> 0 Then
-         m_SelName = m_NameList.FirstOrDefault(Function(namel) namel.Name.Equals(ManageDb.ExecuteClientQuery(nQuery)(0).Name)) 'ManageDb.ExecuteClientQuery(nQuery)(0)
+         Dim sName As String = ManageDb.ExecuteClientQuery(nQuery)(0).Name
+         m_SelName = m_NameList.FirstOrDefault(Function(namel) namel.Name.Equals(sName)) 'ManageDb.ExecuteClientQuery(nQuery)(0)
       Else
          m_SelName = Nothing
       End If
diff --git a/UpdateVersionPage/UpdateVersionPageVM.vb b/UpdateVersionPage/UpdateVersionPageVM.vb
index 6aa36ff..3e5bc92 100644
--- a/UpdateVersionPage/UpdateVersionPageVM.vb
+++ b/UpdateVersionPage/UpdateVersionPageVM.vb
@@ -104,7 +104,8 @@ Public Class UpdateVersionPageVM
             " ON " & DB_PRODUCT & "." & DB_PRODUCTID &
             "=" & DB_VERSION & "." & DB_PRODUCTID &
             " WHERE " & DB_VERSIONID & " LIKE " & IdToUpdate
-      SelProduct = m_ProductList.FirstOrDefault(Function(prodl) prodl.ProductID.Equals(ManageDb.ExecuteVersionQuery(pvQuery)(0).ProductID))
+      Dim ProdId As Integer = ManageDb.ExecuteVersionQuery(pvQuery)(0).ProductID
+      SelProduct = m_ProductList.FirstOrDefault(Function(prodl) prodl.ProductID.Equals(ProdId))
       NotifyPropertyChanged("SelProduct")
 
     End Sub