Fixing pb2 valgrind failure
Missed a 'if condition' check while moving the logic
from one place to another place.