Got rid of arbitrary value for null checks.  Added/updated XML.