diff --git a/src/blackcore/db/airportdatareader.cpp b/src/blackcore/db/airportdatareader.cpp
index 8224356f0..3b95e0e5c 100644
--- a/src/blackcore/db/airportdatareader.cpp
+++ b/src/blackcore/db/airportdatareader.cpp
@@ -61,7 +61,7 @@ namespace BlackCore
                 if (!airportsJson.isEmpty())
                 {
                     CAirportList airports;
-                    airports.convertFromJson(airportsJson);
+                    airports.convertFromJson(airportsJson); //! \todo catch CJsonException or use convertFromJsonNoThrow
                     const int c = airports.size();
                     this->m_airportCache.set(airports);
 
diff --git a/src/blackcore/db/icaodatareader.cpp b/src/blackcore/db/icaodatareader.cpp
index da8644839..2839c4aa0 100644
--- a/src/blackcore/db/icaodatareader.cpp
+++ b/src/blackcore/db/icaodatareader.cpp
@@ -314,7 +314,7 @@ namespace BlackCore
                 if (!countriesJson.isEmpty())
                 {
                     CCountryList countries;
-                    countries.convertFromJson(Json::jsonObjectFromString(countriesJson));
+                    countries.convertFromJson(Json::jsonObjectFromString(countriesJson)); //! \todo catch CJsonException or use convertFromJsonNoThrow
                     const int c = countries.size();
                     this->m_countryCache.set(countries);
 
@@ -330,7 +330,7 @@ namespace BlackCore
                 if (!aircraftJson.isEmpty())
                 {
                     CAircraftIcaoCodeList aircraftIcaos;
-                    aircraftIcaos.convertFromJson(Json::jsonObjectFromString(aircraftJson));
+                    aircraftIcaos.convertFromJson(Json::jsonObjectFromString(aircraftJson)); //! \todo catch CJsonException or use convertFromJsonNoThrow
                     const int c = aircraftIcaos.size();
                     this->m_aircraftIcaoCache.set(aircraftIcaos);
 
@@ -345,7 +345,7 @@ namespace BlackCore
                 if (!airlineJson.isEmpty())
                 {
                     CAirlineIcaoCodeList airlineIcaos;
-                    airlineIcaos.convertFromJson(Json::jsonObjectFromString(airlineJson));
+                    airlineIcaos.convertFromJson(Json::jsonObjectFromString(airlineJson)); //! \todo catch CJsonException or use convertFromJsonNoThrow
                     const int c = airlineIcaos.size();
                     this->m_airlineIcaoCache.set(airlineIcaos);
                     reallyRead |= CEntityFlags::AirlineIcaoEntity;
diff --git a/src/blackcore/db/modeldatareader.cpp b/src/blackcore/db/modeldatareader.cpp
index a9997699b..51139ff7d 100644
--- a/src/blackcore/db/modeldatareader.cpp
+++ b/src/blackcore/db/modeldatareader.cpp
@@ -387,7 +387,7 @@ namespace BlackCore
                 if (!liveriesJson.isEmpty())
                 {
                     CLiveryList liveries;
-                    liveries.convertFromJson(liveriesJson);
+                    liveries.convertFromJson(liveriesJson); //! \todo catch CJsonException or use convertFromJsonNoThrow
                     const int c = liveries.size();
                     this->m_liveryCache.set(liveries);
 
@@ -402,7 +402,7 @@ namespace BlackCore
                 if (!modelsJson.isEmpty())
                 {
                     CAircraftModelList models;
-                    models.convertFromJson(Json::jsonObjectFromString(modelsJson));
+                    models.convertFromJson(Json::jsonObjectFromString(modelsJson)); //! \todo catch CJsonException or use convertFromJsonNoThrow
                     const int c = models.size();
                     this->m_modelCache.set(models);
 
@@ -417,7 +417,7 @@ namespace BlackCore
                 if (!distributorsJson.isEmpty())
                 {
                     CDistributorList distributors;
-                    distributors.convertFromJson(Json::jsonObjectFromString(distributorsJson));
+                    distributors.convertFromJson(Json::jsonObjectFromString(distributorsJson)); //! \todo catch CJsonException or use convertFromJsonNoThrow
                     const int c = distributors.size();
                     this->m_distributorCache.set(distributors);
 
diff --git a/src/blackcore/setupreader.cpp b/src/blackcore/setupreader.cpp
index 7e54c122d..2aba0a526 100644
--- a/src/blackcore/setupreader.cpp
+++ b/src/blackcore/setupreader.cpp
@@ -280,7 +280,7 @@ namespace BlackCore
         QString content(CFileUtils::readFileToString(fn));
         if (content.isEmpty()) { return false; }
         CGlobalSetup s;
-        s.convertFromJson(content);
+        s.convertFromJson(content); //! \todo catch CJsonException or use convertFromJsonNoThrow
         s.setDevelopment(true);
         m_setup.set(s);
         return true;
@@ -311,7 +311,7 @@ namespace BlackCore
             {
                 const CGlobalSetup currentSetup = m_setup.get();
                 CGlobalSetup loadedSetup;
-                loadedSetup.convertFromJson(Json::jsonObjectFromString(setupJson));
+                loadedSetup.convertFromJson(Json::jsonObjectFromString(setupJson)); //! \todo catch CJsonException or use convertFromJsonNoThrow
                 loadedSetup.markAsLoaded(true);
                 if (lastModified > 0 && lastModified > loadedSetup.getMSecsSinceEpoch()) { loadedSetup.setMSecsSinceEpoch(lastModified); }
                 bool sameVersionLoaded = (loadedSetup == currentSetup);
@@ -384,7 +384,7 @@ namespace BlackCore
             {
                 CUpdateInfo currentUpdateInfo(m_updateInfo.get()); // from cache
                 CUpdateInfo loadedUpdateInfo;
-                loadedUpdateInfo.convertFromJson(Json::jsonObjectFromString(setupJson));
+                loadedUpdateInfo.convertFromJson(Json::jsonObjectFromString(setupJson)); //! \todo catch CJsonException or use convertFromJsonNoThrow
                 if (lastModified > 0 && lastModified > loadedUpdateInfo.getMSecsSinceEpoch()) { loadedUpdateInfo.setMSecsSinceEpoch(lastModified); }
                 const bool sameVersionLoaded = (loadedUpdateInfo == currentUpdateInfo);
                 if (sameVersionLoaded)
diff --git a/src/blackgui/views/viewbase.cpp b/src/blackgui/views/viewbase.cpp
index 289df52d2..e846c6df8 100644
--- a/src/blackgui/views/viewbase.cpp
+++ b/src/blackgui/views/viewbase.cpp
@@ -1327,7 +1327,7 @@ namespace BlackGui
                     break;
                 }
                 ContainerType container;
-                container.convertFromJson(json);
+                container.convertFromJson(json); //! \todo catch CJsonException or use convertFromJsonNoThrow
                 m = this->modifyLoadedJsonData(container);
                 if (m.isFailure()) { break; } // modification error
                 m = this->validateLoadedJsonData(container);