Added 404 handling
404 handling