Added 404 handling