Added 404 returns for bad or failed requests