BZ953 Add fix for non_existent