matthewg
committed
on 27 Jun 07
Consolidating check for null variables and adding oo_template to that list