fixed more error handling bugs, within ood_includes()