Some tweaks to work around errors @ischneider, please fix up if necessary
Merge pull request #605 from jj0hns0n/vanity-pages

Some tweaks to work around errors encountered with empty content