diff --git a/src/ParserPrivate.cpp b/src/ParserPrivate.cpp
index 45781c1..5fc5642 100644
--- a/src/ParserPrivate.cpp
+++ b/src/ParserPrivate.cpp
@@ -428,7 +428,7 @@ AScanData ParserPrivate::getAscanDataOfCEMeasured(unsigned short aTasNum,const T
     {
         aShotList = mShotList.get();
     }
-    if (!aShotList->isValid() || !aShotList->hasTasNum(aTasNum))
+    if (!aShotList->isValid() || !aShotList->hasTasNum(aTasNum) || !aShotList->hasCEMeasured())
     {
         return AScanData();
     }
@@ -485,7 +485,7 @@ OneTasAScanData ParserPrivate::getOneTasAscanDataOfCEMeasured(unsigned short aTa
     {
         aShotList = mShotList.get();
     }
-    if (!aShotList->isValid() || !aShotList->hasTasNum(aTasNum))
+    if (!aShotList->isValid() || !aShotList->hasTasNum(aTasNum) || !aShotList->hasCEMeasured())
     {
         return OneTasAScanData();
     }