diff --git a/tic/dll/src/AbstrCalculator.cpp b/tic/dll/src/AbstrCalculator.cpp
index 8a03f33ae..844279b43 100644
--- a/tic/dll/src/AbstrCalculator.cpp
+++ b/tic/dll/src/AbstrCalculator.cpp
@@ -725,23 +725,25 @@ BestItemRef AbstrCalculator::FindPrimaryDataFailedItem() const
 			{
 				if (WasInFailed(ti))
 					goto foundError;
-				if (IsDataItem(ti))
-				{
-					SharedDataItemInterestPtr adi = AsDataItem(ti);
-					adi->PrepareDataUsage(DrlType::Certain);
 
-					DataReadLock lock(adi);
-				}
-				if (IsUnit(ti))
-				{
-					try {
-						AsUnit(ti)->GetCount();
+				try {
+					if (IsDataItem(ti))
+					{
+						SharedDataItemInterestPtr adi = AsDataItem(ti);
+						adi->PrepareDataUsage(DrlType::Certain);
+
+						DataReadLock lock(adi);
 					}
-					catch (...)
+					if (IsUnit(ti))
 					{
-						ti->CatchFail(FR_Data);
+						SharedUnitInterestPtr au = AsUnit(ti);
+						au->GetCount();
 					}
 				}
+				catch (...)
+				{
+					ti->CatchFail(FR_Data);
+				}
 				if (ti->WasFailed(FR_Data))
 					goto foundError;
 			}
diff --git a/tic/dll/src/LispTreeType.cpp b/tic/dll/src/LispTreeType.cpp
index cf2e4d332..e674fcbfe 100644
--- a/tic/dll/src/LispTreeType.cpp
+++ b/tic/dll/src/LispTreeType.cpp
@@ -128,7 +128,7 @@ namespace token {
 
 	TIC_CALL bool isConst(TokenID t)
 	{ 
-		assert(true_.GetNr() + 19 == null_dp.GetNr());
+		assert(true_.GetNr(TokenID::TokenKey()) + 18 == null_dp.GetNr(TokenID::TokenKey()));
 		return t >= true_ && t <= null_dp;
 	}