Add a better Not Found message. Closes #39