Additional null check.  Updated ZIP package.