Fixes #308.
Merge pull request #544 from philipn/null_pagename_msg

Fixes #308.