Bug Fix: Do proper pnr validation