diff --git a/src/discard/discard.f90 b/src/discard/discard.f90
index 2ee3dafec..ad5b73426 100644
--- a/src/discard/discard.f90
+++ b/src/discard/discard.f90
@@ -76,9 +76,9 @@ module subroutine discard_tp(self, system, param)
       integer(I4B) :: npl, ntp
 
       associate(tp => self, cb => system%cb, pl => system%pl)
-         if ((ntp == 0) .or. (npl ==0)) return 
          ntp = tp%nbody
          npl = pl%nbody
+         if ((ntp == 0) .or. (npl ==0)) return 
 
          if ((param%rmin >= 0.0_DP) .or. (param%rmax >= 0.0_DP) .or. &
              (param%rmaxu >= 0.0_DP) .or. ((param%qmin >= 0.0_DP) .and. (param%qmin_coord == "BARY"))) then
diff --git a/src/symba/symba_encounter_check.f90 b/src/symba/symba_encounter_check.f90
index c36cb7004..cc1b9f66d 100644
--- a/src/symba/symba_encounter_check.f90
+++ b/src/symba/symba_encounter_check.f90
@@ -25,7 +25,8 @@ module function symba_encounter_check_pl(self, param, system, dt, irec) result(l
       type(interaction_timer), save :: itimer
       logical, save :: lfirst = .true.
       type(walltimer) :: timer 
-  
+ 
+      lany_encounter = .false.
       if (self%nbody == 0) return
 
       associate(pl => self, plplenc_list => system%plplenc_list)
@@ -200,7 +201,8 @@ module function symba_encounter_check_tp(self, param, system, dt, irec) result(l
       real(DP)                                  :: rshell_irec
       logical,      dimension(:),   allocatable :: lvdotr
       integer(I4B), dimension(:),   allocatable :: index1, index2
-  
+ 
+      lany_encounter = .false.
       if (self%nbody == 0) return
 
       associate(tp => self, ntp => self%nbody, pl => system%pl, npl => system%pl%nbody)