Updated findById condition for WT+ legacy compatability
Removing unnecessary exit(0) call