Add empty checks for findPop[Before|After]