diff --git a/src/genepsi3d.f90 b/src/genepsi3d.f90
index 72f48df5bcd29df566d7ec8ebee8c5b7816fe1db..504b18096540130e3e5c2e06512c5ce17884b945 100644
--- a/src/genepsi3d.f90
+++ b/src/genepsi3d.f90
@@ -314,13 +314,9 @@ contains
     else
        dyraf =yly/real(nyraf-1, mytype)
     endif
-   !  write(*,*) ny, size(yp), size(ypraf), nraf
     do j=1,ny-1
        do jraf=1,nraf
           ypraf(jraf+nraf*(j-1))=yp(j)+real(jraf-1, mytype)*(yp(j+1)-yp(j))/real(nraf, mytype)
-         !  if (ypraf(jraf+nraf*(j-1)) /= ypraf(jraf+nraf*(j-1))) then 
-         !    write(*,*) "At j = ", j, ", jraf = ", jraf, "ypraf = ", yp(j)+real(jraf-1, mytype)*(yp(j+1)-yp(j))/real(nraf, mytype)
-         !  endif
        enddo
     enddo
     if (ncly) then 
@@ -328,11 +324,8 @@ contains
          ypraf(jraf+nraf*(ny-1))=yp(ny)+real(jraf-1,mytype)*(yly-yp(ny))/real(nraf,mytype)
       enddo
     endif
-   !  write(*,*) yp
-    if(.not.ncly)ypraf(nyraf)=yp(ny)
-   !  if(.not.ncly)write(*,*) "Changed ypraf (", nyraf, "). To ", yp(ny)
-   !  write(*,*) ypraf
 
+    if(.not.ncly)ypraf(nyraf)=yp(ny)
     yepsi=zero
     call geomcomplex(yepsi,ystart(1),yend(1),nyraf,1,nyraf,ystart(3),yend(3),dx,ypraf,dz,one)
     ! if (nrank==0) print*,'    step 3'
diff --git a/src/xcompact3d.f90 b/src/xcompact3d.f90
index 96055fa11db18408af622395a2460014d4255f75..62daf00a3766baed071fe0c4a5a12bf49f1766bc 100644
--- a/src/xcompact3d.f90
+++ b/src/xcompact3d.f90
@@ -6,7 +6,7 @@ program xcompact3d
 
   use var
   use case
-
+  use MPI, only: MPI_COMM_WORLD
   use transeq, only : calculate_transeq_rhs
   use time_integrators, only : int_time
   use navier, only : velocity_to_momentum, momentum_to_velocity, pre_correc, &
@@ -20,7 +20,7 @@ program xcompact3d
   use forces, only : force, init_forces, iforces,update_forces, xld,xrd,yld,yud,zld,zrd,torque_calc,nvol
   implicit none
   real(mytype)  :: dummy,drag(10),lift(10),lat(10),grav_effy(10),grav_effx(10),grav_effz(10),xtorq(10),ytorq(10),ztorq(10),maxrad
-  integer :: iounit,ierr,i
+  integer :: iounit,ierr,i,code,ierror
   real, dimension(100) :: x
   character(len=30) :: filename!, filename2
 
@@ -91,7 +91,10 @@ program xcompact3d
                   zld(i) = position(i,3) - maxrad * ra(i) * cvl_scalar
                   zrd(i) = position(i,3) + maxrad * ra(i) * cvl_scalar
                   ! write(*,*) "CV bounds = ", xld(i), xrd(i), yld(i), yud(i), zld(i), zrd(i)
-                  
+                  if ((xld(i).lt.0).or.(xrd(i).gt.xlx).or.(yld(i).lt.0).or.(yud(i).gt.yly).or.(zld(i).lt.0).or.(zrd(i).gt.zlz)) then 
+                     write(*,*) "Body is too close to boundary!"
+                     call MPI_ABORT(MPI_COMM_WORLD,code,ierror)
+                  endif
                endif
             enddo
             if (itime.eq.ifirst) then