guard against NPEs, and refactor the package name from the old project name for web stuff.