Fix issue #642 NPE on Join over Salted table

Verified locally. Will add test cases in a follow-up check-in.