404 handling fixed