This part wasn't actually tested, just the 404 codepath.  Would test on the develop central server next.