diff --git a/src/Makefile b/src/Makefile
index 16b08332bc..1bebfcd446 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -33,7 +33,7 @@ ifeq ($(COMPILER),intel)
 
   # Debugging
   ifeq ($(DEBUG),yes)
-    F90FLAGS += -g -traceback -ftrapuv -fp-stack-check -check all
+    F90FLAGS += -g -traceback -ftrapuv -fp-stack-check -check all -fpe0
     LDFLAGS  += -g
   endif
 
diff --git a/src/geometry.F90 b/src/geometry.F90
index 35612f23cc..1dae6cedc8 100644
--- a/src/geometry.F90
+++ b/src/geometry.F90
@@ -513,9 +513,21 @@ contains
     ! Find cell in next lattice element
     call find_cell(p, found)
     if (.not. found) then
-       message = "Could not locate particle " // trim(to_str(p % id)) // &
-            " in universe " // to_str(universes(p % coord % universe) % id)
-       call fatal_error()
+       ! In some circumstances, a particle crossing the corner of a cell may not
+       ! be able to be found in the next universe. In this scenario we cut off
+       ! all lower-level coordinates and search from universe zero
+       
+       ! Remove lower coordinates
+       call deallocate_coord(p % coord0 % next)
+       p % coord => p % coord0
+
+       ! Search for particle
+       call find_cell(p, found)
+       if (.not. found) then
+          message = "Could not locate particle " // trim(to_str(p % id)) // &
+               " after crossing a lattice boundary."
+          call fatal_error()
+       end if
     end if
 
   end subroutine cross_lattice