Better 404 support, fixes #1