diff --git a/hal/src/main/native/athena/HAL.cpp b/hal/src/main/native/athena/HAL.cpp
index dbdb826ce5..427386b67e 100644
--- a/hal/src/main/native/athena/HAL.cpp
+++ b/hal/src/main/native/athena/HAL.cpp
@@ -379,8 +379,9 @@ HAL_Bool HAL_Initialize(int32_t timeout, int32_t mode) {
     uint64_t rv = HAL_GetFPGATime(&status);
     if (status != 0) {
       wpi::errs()
-          << "Call to HAL_GetFPGATime failed."
-          << "Initialization might have failed. Time will not be correct\n";
+          << "Call to HAL_GetFPGATime failed in wpi::Now() with status "
+          << status
+          << ". Initialization might have failed. Time will not be correct\n";
       wpi::errs().flush();
       return 0u;
     }
diff --git a/hal/src/main/native/cpp/cpp/fpga_clock.cpp b/hal/src/main/native/cpp/cpp/fpga_clock.cpp
index 751eae1327..ab77be8816 100644
--- a/hal/src/main/native/cpp/cpp/fpga_clock.cpp
+++ b/hal/src/main/native/cpp/cpp/fpga_clock.cpp
@@ -21,8 +21,9 @@ fpga_clock::time_point fpga_clock::now() noexcept {
   uint64_t currentTime = HAL_GetFPGATime(&status);
   if (status != 0) {
     wpi::errs()
-        << "Call to HAL_GetFPGATime failed."
-        << "Initialization might have failed. Time will not be correct\n";
+        << "Call to HAL_GetFPGATime failed in fpga_clock::now() with status "
+        << status
+        << ". Initialization might have failed. Time will not be correct\n";
     wpi::errs().flush();
     return epoch();
   }