Fixed so we test for compute,fix and variable id's being NULL in find_ functions
(cherry picked from commit 12e1857e3046c4529438eddb3c3550058970bdd8)