Add better/correct 404 handling to file and ns like added to tt in 29e271c91ed7928c0f3a895259d9390af372e0fb