PAXWEB-493 prevent duplicate lookup and remove redundant null check