diff --git a/.clang-tidy b/.clang-tidy
index 3515d6a2a..33eeda4b4 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -12,6 +12,7 @@ Checks: '-*,
         cppcoreguidelines-slicing,
         google-build-namespaces,
         google-runtime-int,
+        hicpp-exception-baseclass,
         misc-misplaced-const,
         misc-new-delete-overloads,
         misc-non-copyable-objects,
diff --git a/src/algorithms/tracking/libs/tcp_communication.cc b/src/algorithms/tracking/libs/tcp_communication.cc
index 30809ecc6..f0b191c3e 100644
--- a/src/algorithms/tracking/libs/tcp_communication.cc
+++ b/src/algorithms/tracking/libs/tcp_communication.cc
@@ -32,6 +32,7 @@
 #include "tcp_communication.h"
 #include "tcp_packet_data.h"
 #include <iostream>
+#include <stdexcept>
 #include <string>
 
 
@@ -87,7 +88,7 @@ void Tcp_Communication::send_receive_tcp_packet_galileo_e1(boost::array<float, N
             //! Control. The GNSS-SDR program ends if an error in a TCP packet is detected.
             if (d_control_id_ != readbuf.data()[0])
                 {
-                    throw "Packet error!";
+                    throw std::runtime_error("Packet error!");
                 }
 
             // Recover the variables received
@@ -122,7 +123,7 @@ void Tcp_Communication::send_receive_tcp_packet_gps_l1_ca(boost::array<float, NU
             //! Control. The GNSS-SDR program ends if an error in a TCP packet is detected.
             if (d_control_id_ != readbuf.data()[0])
                 {
-                    throw "Packet error!";
+                    throw std::runtime_error("Packet error!");
                 }
 
             // Recover the variables received
diff --git a/src/core/system_parameters/GPS_L1_CA.h b/src/core/system_parameters/GPS_L1_CA.h
index 420a49d01..fb0321b0f 100644
--- a/src/core/system_parameters/GPS_L1_CA.h
+++ b/src/core/system_parameters/GPS_L1_CA.h
@@ -71,9 +71,7 @@ const uint32_t GPS_L1_CA_OPT_ACQ_FS_HZ = 2000000;  //!< Sampling frequency that
  */
 const double MAX_TOA_DELAY_MS = 20;
 
-//#define NAVIGATION_SOLUTION_RATE_MS 1000 // this cannot go here
-//const double GPS_STARTOFFSET_ms = 68.802;  //[ms] Initial sign. travel time (this cannot go here)
-const double GPS_STARTOFFSET_MS = 60.0;
+const double GPS_STARTOFFSET_MS = 68.802;  // [ms] Initial signal travel time (only for old ls_pvt implementation)
 
 // OBSERVABLE HISTORY DEEP FOR INTERPOLATION
 const int32_t GPS_L1_CA_HISTORY_DEEP = 100;
diff --git a/src/utils/front-end-cal/front_end_cal.cc b/src/utils/front-end-cal/front_end_cal.cc
index 2607c4efa..017325c4a 100644
--- a/src/utils/front-end-cal/front_end_cal.cc
+++ b/src/utils/front-end-cal/front_end_cal.cc
@@ -45,6 +45,7 @@
 #include <cmath>
 #include <iostream>  // for operator<<
 #include <map>
+#include <stdexcept>
 #include <utility>
 
 extern Concurrent_Map<Gps_Ephemeris> global_gps_ephemeris_map;
@@ -303,7 +304,7 @@ arma::vec FrontEndCal::geodetic2ecef(double phi, double lambda, double h, const
 }
 
 
-double FrontEndCal::estimate_doppler_from_eph(unsigned int PRN, double TOW, double lat, double lon, double height)
+double FrontEndCal::estimate_doppler_from_eph(unsigned int PRN, double TOW, double lat, double lon, double height) noexcept(false)
 {
     int num_secs = 10;
     double step_secs = 0.5;
@@ -359,7 +360,7 @@ double FrontEndCal::estimate_doppler_from_eph(unsigned int PRN, double TOW, doub
             mean_Doppler_Hz = arma::mean(Doppler_Hz);
             return mean_Doppler_Hz;
         }
-    throw(1);
+    throw std::runtime_error("1");
 }
 
 
diff --git a/src/utils/front-end-cal/front_end_cal.h b/src/utils/front-end-cal/front_end_cal.h
index 07022e505..5f23311b9 100644
--- a/src/utils/front-end-cal/front_end_cal.h
+++ b/src/utils/front-end-cal/front_end_cal.h
@@ -65,7 +65,7 @@ public:
      * 3- Approximate receiver Latitude and Longitude (WGS-84)
      *
      */
-    double estimate_doppler_from_eph(unsigned int PRN, double TOW, double lat, double lon, double height);
+    double estimate_doppler_from_eph(unsigned int PRN, double TOW, double lat, double lon, double height) noexcept(false);
 
     /*!
      * \brief This function models the Elonics E4000 + RTL2832 front-end
diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc
index efd752206..935bb4946 100644
--- a/src/utils/front-end-cal/main.cc
+++ b/src/utils/front-end-cal/main.cc
@@ -574,7 +574,7 @@ int main(int argc, char** argv)
                 {
                     std::cout << "Exception caught while reading ephemeris" << std::endl;
                 }
-            catch (int ex)
+            catch (const std::exception& ex)
                 {
                     std::cout << "  " << it.first << "   " << it.second << "  (Eph not found)" << std::endl;
                 }