diff --git a/src/constants.f90 b/src/constants.f90
index 332df302ee..82ca27e4e9 100644
--- a/src/constants.f90
+++ b/src/constants.f90
@@ -19,10 +19,10 @@ module constants
   real(8), parameter :: FREE_GAS_THRESHOLD = 400.0
 
   ! Used for surface current tallies
-  real(8), parameter :: TINY_BIT = 1e-8
+  real(8), parameter :: TINY_BIT = 1e-8_8
 
   ! User for precision in geometry
-  real(8), parameter :: FP_PRECISION = 1e-9_8
+  real(8), parameter :: FP_PRECISION = 1e-8_8
 
   ! Maximum number of collisions/crossings
   integer, parameter :: MAX_EVENTS = 10000
diff --git a/src/geometry.f90 b/src/geometry.f90
index 0116695c36..991e979f19 100644
--- a/src/geometry.f90
+++ b/src/geometry.f90
@@ -406,8 +406,9 @@ contains
 
     ! Couldn't find next cell anywhere!
     if ((.not. found) .and. (.not. plotting)) then
-       message = "After particle crossed surface " // trim(int_to_str(p%surface)) &
-            // ", it could not be located in any cell and it did not leak."
+       message = "After particle crossed surface " // trim(int_to_str( &
+            surfaces(abs(p%surface)) % id)) // " it could not be located in " &
+            // "any cell and it did not leak."
        call fatal_error()
     end if