fixed 404 handling